From: Ben Hutchings Date: Wed, 30 Jun 2010 02:47:40 +0000 (+0000) Subject: vmxnet3: Remove incorrect implementation of ethtool_ops::get_flags() X-Git-Tag: v2.6.36-rc1~571^2~390 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cbf2d604a1cd77944a795bb8dbe844eaa38b44c8;p=platform%2Fkernel%2Flinux-stable.git 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 Signed-off-by: Bhavesh Davda Signed-off-by: David S. Miller --- diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c index 8a71a21..de1ba14 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) } } -static u32 -vmxnet3_get_flags(struct net_device *netdev) -{ - return netdev->features; -} - static int vmxnet3_set_flags(struct net_device *netdev, u32 data) { @@ -559,7 +553,7 @@ static struct ethtool_ops vmxnet3_ethtool_ops = { .get_tso = ethtool_op_get_tso, .set_tso = ethtool_op_set_tso, .get_strings = vmxnet3_get_strings, - .get_flags = vmxnet3_get_flags, + .get_flags = ethtool_op_get_flags, .set_flags = vmxnet3_set_flags, .get_sset_count = vmxnet3_get_sset_count, .get_ethtool_stats = vmxnet3_get_ethtool_stats,