From e7244de63942726ae52d8ffc7ea50e9f7972d6bd Mon Sep 17 00:00:00 2001 From: Jesse Brandeburg Date: Thu, 11 Sep 2008 19:57:17 -0700 Subject: [PATCH] --- yaml --- r: 111849 b: refs/heads/master c: 3d3d6d3cc2ad1e77516f3ad3f79d5988ebc361cf h: refs/heads/master i: 111847: dac05d41e38a1249cc5275c0afd8da880cc0115f v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_ethtool.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5a1cba4b4e6a..3af291ba234a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05857980cf15d96dd9eb47dd444b0634f436ba34 +refs/heads/master: 3d3d6d3cc2ad1e77516f3ad3f79d5988ebc361cf diff --git a/trunk/drivers/net/ixgbe/ixgbe_ethtool.c b/trunk/drivers/net/ixgbe/ixgbe_ethtool.c index 64460b4c50ca..2506f9eae58e 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_ethtool.c +++ b/trunk/drivers/net/ixgbe/ixgbe_ethtool.c @@ -241,7 +241,7 @@ static int ixgbe_set_tx_csum(struct net_device *netdev, u32 data) if (data) netdev->features |= (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM); else - netdev->features &= ~NETIF_F_IP_CSUM; + netdev->features &= ~(NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM); return 0; }