10 files changed, 32 insertions, 60 deletions

diff --git a/drivers/net/cxgb4/cxgb4_main.c b/drivers/net/cxgb4/cxgb4_main.c
index 65281674de91..55a720e4abdc 100644
--- a/drivers/net/cxgb4/cxgb4_main.c
+++ b/drivers/net/cxgb4/cxgb4_main.c
@@ -1799,14 +1799,7 @@ static int set_tso(struct net_device *dev, u32 value)
 
 static int set_flags(struct net_device *dev, u32 flags)
 {
-        if (flags & ~ETH_FLAG_RXHASH)
-                return -EOPNOTSUPP;
-
-        if (flags & ETH_FLAG_RXHASH)
-                dev->features |= NETIF_F_RXHASH;
-        else
-                dev->features &= ~NETIF_F_RXHASH;
-        return 0;
+        return ethtool_op_set_flags(dev, flags, ETH_FLAG_RXHASH);
 }
 
 static struct ethtool_ops cxgb_ethtool_ops = {
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index 6c6795b90fa6..77a7f87d498e 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -365,7 +365,6 @@ static const struct ethtool_ops enic_ethtool_ops = {
         .get_coalesce = enic_get_coalesce,
         .set_coalesce = enic_set_coalesce,
         .get_flags = ethtool_op_get_flags,
-        .set_flags = ethtool_op_set_flags,
 };
 
 static void enic_free_wq_buf(struct vnic_wq *wq, struct vnic_wq_buf *buf)
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index 873b45efca40..7d2e5ea2deba 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -2205,8 +2205,11 @@ static int ixgbe_set_flags(struct net_device *netdev, u32 data)
 {
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
         bool need_reset = false;
+        int rc;
 
-        ethtool_op_set_flags(netdev, data);
+        rc = ethtool_op_set_flags(netdev, data, ETH_FLAG_LRO | ETH_FLAG_NTUPLE);
+        if (rc)
+                return rc;
 
         /* if state changes we need to update adapter->flags and reset */
         if (adapter->flags2 & IXGBE_FLAG2_RSC_CAPABLE) {
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index e345ec8cb473..82b720f29c75 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -1636,6 +1636,11 @@ static void mv643xx_eth_get_ethtool_stats(struct net_device *dev,
         }
 }
 
+static int mv643xx_eth_set_flags(struct net_device *dev, u32 data)
+{
+        return ethtool_op_set_flags(dev, data, ETH_FLAG_LRO);
+}
+
 static int mv643xx_eth_get_sset_count(struct net_device *dev, int sset)
 {
         if (sset == ETH_SS_STATS)
@@ -1661,7 +1666,7 @@ static const struct ethtool_ops mv643xx_eth_ethtool_ops = {
         .get_strings            = mv643xx_eth_get_strings,
         .get_ethtool_stats      = mv643xx_eth_get_ethtool_stats,
         .get_flags              = ethtool_op_get_flags,
-        .set_flags              = ethtool_op_set_flags,
+        .set_flags              = mv643xx_eth_set_flags,
         .get_sset_count         = mv643xx_eth_get_sset_count,
 };
 
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index e0b47cc8a86e..d771d1650d60 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -1730,8 +1730,7 @@ static int myri10ge_set_rx_csum(struct net_device *netdev, u32 csum_enabled)
         if (csum_enabled)
                 mgp->csum_flag = MXGEFW_FLAGS_CKSUM;
         else {
-                u32 flags = ethtool_op_get_flags(netdev);
-                err = ethtool_op_set_flags(netdev, (flags & ~ETH_FLAG_LRO));
+                netdev->features &= ~NETIF_F_LRO;
                 mgp->csum_flag = 0;
 
         }
@@ -1900,6 +1899,11 @@ static u32 myri10ge_get_msglevel(struct net_device *netdev)
         return mgp->msg_enable;
 }
 
+static int myri10ge_set_flags(struct net_device *netdev, u32 value)
+{
+        return ethtool_op_set_flags(netdev, value, ETH_FLAG_LRO);
+}
+
 static const struct ethtool_ops myri10ge_ethtool_ops = {
         .get_settings = myri10ge_get_settings,
         .get_drvinfo = myri10ge_get_drvinfo,
@@ -1920,7 +1924,7 @@ static const struct ethtool_ops myri10ge_ethtool_ops = {
         .set_msglevel = myri10ge_set_msglevel,
         .get_msglevel = myri10ge_get_msglevel,
         .get_flags = ethtool_op_get_flags,
-        .set_flags = ethtool_op_set_flags
+        .set_flags = myri10ge_set_flags
 };
 
 static int myri10ge_allocate_rings(struct myri10ge_slice_state *ss)
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 63e8e3893bd6..3d523cb7975a 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -7920,14 +7920,7 @@ static int niu_phys_id(struct net_device *dev, u32 data)
 
 static int niu_set_flags(struct net_device *dev, u32 data)
 {
-        if (data & (ETH_FLAG_LRO | ETH_FLAG_NTUPLE))
-                return -EOPNOTSUPP;
-
-        if (data & ETH_FLAG_RXHASH)
-                dev->features |= NETIF_F_RXHASH;
-        else
-                dev->features &= ~NETIF_F_RXHASH;
-        return 0;
+        return ethtool_op_set_flags(dev, data, ETH_FLAG_RXHASH);
 }
 
 static const struct ethtool_ops niu_ethtool_ops = {
diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/sfc/ethtool.c
index 7693cfbf9cf4..23372bf5cd59 100644
--- a/drivers/net/sfc/ethtool.c
+++ b/drivers/net/sfc/ethtool.c
@@ -551,10 +551,7 @@ static int efx_ethtool_set_flags(struct net_device *net_dev, u32 data)
         struct efx_nic *efx = netdev_priv(net_dev);
         u32 supported = efx->type->offload_features & ETH_FLAG_RXHASH;
 
-        if (data & ~supported)
-                return -EOPNOTSUPP;
-
-        return ethtool_op_set_flags(net_dev, data);
+        return ethtool_op_set_flags(net_dev, data, supported);
 }
 
 static void efx_ethtool_self_test(struct net_device *net_dev,
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 7985165e84fc..c762c6ac055b 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -4188,17 +4188,13 @@ static int sky2_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom
 static int sky2_set_flags(struct net_device *dev, u32 data)
 {
         struct sky2_port *sky2 = netdev_priv(dev);
+        u32 supported =
+                (sky2->hw->flags & SKY2_HW_RSS_BROKEN) ? 0 : ETH_FLAG_RXHASH;
+        int rc;
 
-        if (data & ~ETH_FLAG_RXHASH)
-                return -EOPNOTSUPP;
-
-        if (data & ETH_FLAG_RXHASH) {
-                if (sky2->hw->flags & SKY2_HW_RSS_BROKEN)
-                        return -EINVAL;
-
-                dev->features |= NETIF_F_RXHASH;
-        } else
-                dev->features &= ~NETIF_F_RXHASH;
+        rc = ethtool_op_set_flags(dev, data, supported);
+        if (rc)
+                return rc;
 
         rx_set_rss(dev);
 
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 2c8af093d8b3..084ddb3c8032 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -457,7 +457,7 @@ int ethtool_op_set_tso(struct net_device *dev, u32 data);
 u32 ethtool_op_get_ufo(struct net_device *dev);
 int ethtool_op_set_ufo(struct net_device *dev, u32 data);
 u32 ethtool_op_get_flags(struct net_device *dev);
-int ethtool_op_set_flags(struct net_device *dev, u32 data);
+int ethtool_op_set_flags(struct net_device *dev, u32 data, u32 supported);
 void ethtool_ntuple_flush(struct net_device *dev);
 
 /**
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index a0f4964033d2..5d42fae520d9 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -144,31 +144,13 @@ u32 ethtool_op_get_flags(struct net_device *dev)
 }
 EXPORT_SYMBOL(ethtool_op_get_flags);
 
-int ethtool_op_set_flags(struct net_device *dev, u32 data)
+int ethtool_op_set_flags(struct net_device *dev, u32 data, u32 supported)
 {
-        const struct ethtool_ops *ops = dev->ethtool_ops;
-        unsigned long features = dev->features;
-
-        if (data & ETH_FLAG_LRO)
-                features |= NETIF_F_LRO;
-        else
-                features &= ~NETIF_F_LRO;
-
-        if (data & ETH_FLAG_NTUPLE) {
-                if (!ops->set_rx_ntuple)
-                        return -EOPNOTSUPP;
-                features |= NETIF_F_NTUPLE;
-        } else {
-                /* safe to clear regardless */
-                features &= ~NETIF_F_NTUPLE;
-        }
-
-        if (data & ETH_FLAG_RXHASH)
-                features |= NETIF_F_RXHASH;
-        else
-                features &= ~NETIF_F_RXHASH;
+        if (data & ~supported)
+                return -EINVAL;
 
-        dev->features = features;
+        dev->features = ((dev->features & ~flags_dup_features) |
+                         (data & flags_dup_features));
         return 0;
 }
 EXPORT_SYMBOL(ethtool_op_set_flags);