From: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
To: netdev@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>,
Ben Hutchings <bhutchings@solarflare.com>
Subject: [PATCH v4 2/9] net: ethtool: break association of ETH_FLAG_* with NETIF_F_*
Date: Tue, 25 Oct 2011 02:36:33 +0200 (CEST) [thread overview]
Message-ID: <ea6770fe9542f76e12ddc79c1a9479a0d47429d9.1319495302.git.mirq-linux@rere.qmqm.pl> (raw)
In-Reply-To: <cover.1319495301.git.mirq-linux@rere.qmqm.pl>
This is the only place left where dev->features are directly
exposed to userspace.
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
net/core/ethtool.c | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index db8a77b..a354919 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -240,32 +240,45 @@ static int ethtool_set_one_feature(struct net_device *dev,
return 0;
}
-/* the following list of flags are the same as their associated
- * NETIF_F_xxx values in include/linux/netdevice.h
- */
-static const u32 flags_dup_features =
- (ETH_FLAG_LRO | ETH_FLAG_RXVLAN | ETH_FLAG_TXVLAN | ETH_FLAG_NTUPLE |
- ETH_FLAG_RXHASH);
+#define ETH_ALL_FLAGS (ETH_FLAG_LRO | ETH_FLAG_RXVLAN | ETH_FLAG_TXVLAN | \
+ ETH_FLAG_NTUPLE | ETH_FLAG_RXHASH)
+#define ETH_ALL_FEATURES (NETIF_F_LRO | NETIF_F_HW_VLAN_RX | \
+ NETIF_F_HW_VLAN_TX | NETIF_F_NTUPLE | NETIF_F_RXHASH)
static u32 __ethtool_get_flags(struct net_device *dev)
{
- return dev->features & flags_dup_features;
+ u32 flags = 0;
+
+ if (dev->features & NETIF_F_LRO) flags |= ETH_FLAG_LRO;
+ if (dev->features & NETIF_F_HW_VLAN_RX) flags |= ETH_FLAG_RXVLAN;
+ if (dev->features & NETIF_F_HW_VLAN_TX) flags |= ETH_FLAG_TXVLAN;
+ if (dev->features & NETIF_F_NTUPLE) flags |= ETH_FLAG_NTUPLE;
+ if (dev->features & NETIF_F_RXHASH) flags |= ETH_FLAG_RXHASH;
+
+ return flags;
}
static int __ethtool_set_flags(struct net_device *dev, u32 data)
{
+ u32 features = 0;
u32 changed;
- if (data & ~flags_dup_features)
+ if (data & ~ETH_ALL_FLAGS)
return -EINVAL;
+ if (data & ETH_FLAG_LRO) features |= NETIF_F_LRO;
+ if (data & ETH_FLAG_RXVLAN) features |= NETIF_F_HW_VLAN_RX;
+ if (data & ETH_FLAG_TXVLAN) features |= NETIF_F_HW_VLAN_TX;
+ if (data & ETH_FLAG_NTUPLE) features |= NETIF_F_NTUPLE;
+ if (data & ETH_FLAG_RXHASH) features |= NETIF_F_RXHASH;
+
/* allow changing only bits set in hw_features */
- changed = (data ^ dev->features) & flags_dup_features;
+ changed = (features ^ dev->features) & ETH_ALL_FEATURES;
if (changed & ~dev->hw_features)
return (changed & dev->hw_features) ? -EINVAL : -EOPNOTSUPP;
dev->wanted_features =
- (dev->wanted_features & ~changed) | (data & dev->hw_features);
+ (dev->wanted_features & ~changed) | (features & changed);
__netdev_update_features(dev);
--
1.7.6.3
next prev parent reply other threads:[~2011-10-25 0:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-25 0:36 [PATCH v4 0/9] Cleanup and extension of netdev features Michał Mirosław
2011-10-25 0:36 ` [PATCH v4 8/9] net: extend netdev_features_t to 64 bits Michał Mirosław
2011-10-25 0:36 ` [PATCH v4 4/9] net: introduce and use netdev_features_t for device features sets Michał Mirosław
2011-10-25 0:36 ` [PATCH v4 9/9] net: remove NETIF_F_NO_CSUM feature bit Michał Mirosław
2011-10-25 0:36 ` [PATCH v4 6/9] net: ethtool: use C99 array initialization for feature-names table Michał Mirosław
2011-10-25 0:36 ` [PATCH v4 7/9] ethtool: prepare for larger netdev_features_t type Michał Mirosław
2011-10-25 0:36 ` [PATCH v4 5/9] net: Define enum for net device features Michał Mirosław
2011-10-25 0:36 ` Michał Mirosław [this message]
2011-10-25 0:36 ` [PATCH v4 3/9] net: split netdev features to separate header Michał Mirosław
2011-10-25 0:36 ` [PATCH v4 1/9] net: remove legacy ethtool ops Michał Mirosław
2011-10-25 3:35 ` [PATCH v4 0/9] Cleanup and extension of netdev features Eric Dumazet
2011-10-25 3:44 ` Eric Dumazet
2011-10-28 21:47 ` Michał Mirosław
2011-11-04 2:46 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ea6770fe9542f76e12ddc79c1a9479a0d47429d9.1319495302.git.mirq-linux@rere.qmqm.pl \
--to=mirq-linux@rere.qmqm.pl \
--cc=bhutchings@solarflare.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).