---

yaml --- r: 224379 b: refs/heads/master c: e2b4e21 h: refs/heads/master i: 224377: 22b089f 224375: 5a4ef86 v: v3
git-mirror · Nov 17, 2010 · 2fd9096 · 2fd9096
1 parent f339a5c
commit 2fd9096
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd50817859e7e82ba6e4adc75ebd8ac19459d8a4
+refs/heads/master: e2b4e216b7e9da09175c76887c754489681533b9
diff --git a/trunk/drivers/net/ixgbe/ixgbe_ethtool.c b/trunk/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -425,13 +425,12 @@ static int ixgbe_set_tx_csum(struct net_device *netdev, u32 data)
 	struct ixgbe_adapter *adapter = netdev_priv(netdev);
 
 	if (data) {
-		netdev->features |= (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM);
+		netdev->features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
 		if (adapter->hw.mac.type == ixgbe_mac_82599EB)
 			netdev->features |= NETIF_F_SCTP_CSUM;
 	} else {
-		netdev->features &= ~(NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM);
-		if (adapter->hw.mac.type == ixgbe_mac_82599EB)
-			netdev->features &= ~NETIF_F_SCTP_CSUM;
+		netdev->features &= ~(NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
+				      NETIF_F_SCTP_CSUM);
 	}
 
 	return 0;