diff options
| author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2011-11-15 15:29:55 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-16 17:43:08 -0500 |
| commit | bc5787c6125cc2c868eaace46c46ce6e83dcfcb6 (patch) | |
| tree | 831619892302478a2ceb27d9edbffc871cf9ad26 /net/core/dev.c | |
| parent | 33a5ba144e3e7ffc1cd4a1d205e99c16078885bf (diff) | |
net: remove legacy ethtool ops
As all drivers are converted, we may now remove discrete offload setting
callback handling.
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Acked-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 51f89cd0a3f4..185e246d61fd 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1321,8 +1321,6 @@ EXPORT_SYMBOL(dev_close); */ void dev_disable_lro(struct net_device *dev) { - u32 flags; - /* * If we're trying to disable lro on a vlan device * use the underlying physical device instead @@ -1330,15 +1328,9 @@ void dev_disable_lro(struct net_device *dev) if (is_vlan_dev(dev)) dev = vlan_dev_real_dev(dev); - if (dev->ethtool_ops && dev->ethtool_ops->get_flags) - flags = dev->ethtool_ops->get_flags(dev); - else - flags = ethtool_op_get_flags(dev); - - if (!(flags & ETH_FLAG_LRO)) - return; + dev->wanted_features &= ~NETIF_F_LRO; + netdev_update_features(dev); - __ethtool_set_flags(dev, flags & ~ETH_FLAG_LRO); if (unlikely(dev->features & NETIF_F_LRO)) netdev_WARN(dev, "failed to disable LRO!\n"); } |