[PATCH v2 06/16] net: use ndo_fix_features for ethtool_ops->set_flags
From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: 2011-01-22 22:14:15
Subsystem:
networking [general], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> --- net/core/ethtool.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 621f004..35dce10 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c@@ -240,6 +240,25 @@ static int ethtool_set_features(struct net_device *dev, void __user *useraddr) return ret; } +static int __ethtool_set_flags(struct net_device *dev, u32 data) +{ + if (data & ~flags_dup_features) + return -EINVAL; + + if (!(dev->hw_features & flags_dup_features)) { + if (!dev->ethtool_ops->set_flags) + return -EOPNOTSUPP; + return dev->ethtool_ops->set_flags(dev, data); + } + + dev->wanted_features = + (dev->wanted_features & ~flags_dup_features) | data; + + netdev_update_features(dev); + + return 0; +} + static u32 ethtool_get_feature_mask(u32 eth_cmd) { /* feature masks of legacy discrete ethtool ops */
@@ -1733,8 +1752,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr) ethtool_op_get_flags)); break; case ETHTOOL_SFLAGS: - rc = ethtool_set_value(dev, useraddr, - dev->ethtool_ops->set_flags); + rc = ethtool_set_value(dev, useraddr, __ethtool_set_flags); break; case ETHTOOL_GPFLAGS: rc = ethtool_get_value(dev, useraddr, ethcmd,
--
1.7.2.3