Skip to contentSkip to conversation

net-e1000e: fix ethtool set_features taking new features into account too late

PATCH New David Decotigny 1 participant 1 message Nov 22, 2011 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore
#1 lore raw

PATCH v3 1/1 net-e1000e: fix ethtool set_features taking new features into account too late

In reply to a message not in the archive

Before this patch, the set_features() ethtool callback would not take the new specified features into account when configuring the NIC. It would only consider the current features, ie. the ones after previous set_features(). A second ethtool set_features() with the same specified features cannot work around that issue because it would boil down to a nop (code checks wether specified features changed or not).

This patch solves this by propagating the requested features.

Tested:
printk in code + custom ethtool (based on
http://patchwork.ozlabs.org/patch/95836/)

---
 drivers/net/ethernet/intel/e1000e/netdev.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/e1000e/netdev.c +9 -2
index a5bd7a3..a83a108 100644
@@ -5901,7 +5901,7 @@ static void e1000_eeprom_checks(struct e1000_adapter *adapter)
 }
 
 static int e1000_set_features(struct net_device *netdev,
-	netdev_features_t features)
+			      netdev_features_t features)
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 	netdev_features_t changed = features ^ netdev->features;
@@ -5913,12 +5913,19 @@ static int e1000_set_features(struct net_device *netdev,
 			 NETIF_F_RXCSUM)))
 		return 0;
 
+	/* We will make sure to return 1 below so that we can change
+	 * netdev->features on the fly from within the functions
+	 * called below in case of error, without core/dev.c
+	 * overriding it. */
+	netdev->features = features;
+
 	if (netif_running(netdev))
 		e1000e_reinit_locked(adapter);
 	else
 		e1000e_reset(adapter);
 
-	return 0;
+	return 1; /* tell net/core/dev.c not to override
+		   * netdev->features */
 }
 
 static const struct net_device_ops e1000e_netdev_ops = {
Signature · 1 line
1.7.3.1