From: Jesse Brandeburg Date: Fri, 12 Sep 2008 02:57:17 +0000 (-0700) Subject: ixgbe: fix ethtool disable csum for ipv6 X-Git-Tag: v2.6.28-rc1~717^2~195^2~28 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3d3d6d3cc2ad1e77516f3ad3f79d5988ebc361cf;p=linux-2.6-omap-h63xx.git ixgbe: fix ethtool disable csum for ipv6 ethtool was not disabling the correct netif flags when setting checksum disable. Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c index 64460b4c50c..2506f9eae58 100644 --- a/drivers/net/ixgbe/ixgbe_ethtool.c +++ b/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; }