Browse Source

ixgbe: cleanup ixgbe_set_tx_csum ethtool flags configuration

This change makes it so that we always disable SCTP regardless of mac type
since we shouldn't need to check mac type before disabling a feature that
isn't supported on a given piece of hardware.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Alexander Duyck 14 years ago
parent
commit
e2b4e216b7
1 changed files with 3 additions and 4 deletions
  1. 3 4
      drivers/net/ixgbe/ixgbe_ethtool.c

+ 3 - 4
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;