diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2010-06-29 22:47:40 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-30 17:09:36 -0400 |
commit | cbf2d604a1cd77944a795bb8dbe844eaa38b44c8 (patch) | |
tree | 2881f953ac36d6fbf6662ad3264babe5303685db /drivers/net/vmxnet3 | |
parent | 97d1935a61b7fe7a65f98f154c7f3301cfe746f3 (diff) |
vmxnet3: Remove incorrect implementation of ethtool_ops::get_flags()
Only some netdev feature flags correspond directly to ethtool feature
flags. ethtool_op_get_flags() does the right thing.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Bhavesh Davda <bhavesh@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vmxnet3')
-rw-r--r-- | drivers/net/vmxnet3/vmxnet3_ethtool.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c index 8a71a21d53ec..de1ba148171e 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethtool.c +++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c | |||
@@ -275,12 +275,6 @@ vmxnet3_get_strings(struct net_device *netdev, u32 stringset, u8 *buf) | |||
275 | } | 275 | } |
276 | } | 276 | } |
277 | 277 | ||
278 | static u32 | ||
279 | vmxnet3_get_flags(struct net_device *netdev) | ||
280 | { | ||
281 | return netdev->features; | ||
282 | } | ||
283 | |||
284 | static int | 278 | static int |
285 | vmxnet3_set_flags(struct net_device *netdev, u32 data) | 279 | vmxnet3_set_flags(struct net_device *netdev, u32 data) |
286 | { | 280 | { |
@@ -559,7 +553,7 @@ static struct ethtool_ops vmxnet3_ethtool_ops = { | |||
559 | .get_tso = ethtool_op_get_tso, | 553 | .get_tso = ethtool_op_get_tso, |
560 | .set_tso = ethtool_op_set_tso, | 554 | .set_tso = ethtool_op_set_tso, |
561 | .get_strings = vmxnet3_get_strings, | 555 | .get_strings = vmxnet3_get_strings, |
562 | .get_flags = vmxnet3_get_flags, | 556 | .get_flags = ethtool_op_get_flags, |
563 | .set_flags = vmxnet3_set_flags, | 557 | .set_flags = vmxnet3_set_flags, |
564 | .get_sset_count = vmxnet3_get_sset_count, | 558 | .get_sset_count = vmxnet3_get_sset_count, |
565 | .get_ethtool_stats = vmxnet3_get_ethtool_stats, | 559 | .get_ethtool_stats = vmxnet3_get_ethtool_stats, |