aboutsummaryrefslogtreecommitdiffstats
path: root/net/8021q
diff options
context:
space:
mode:
authorMichał Mirosław <mirq-linux@rere.qmqm.pl>2011-11-15 10:29:55 -0500
committerDavid S. Miller <davem@davemloft.net>2011-11-16 17:43:08 -0500
commitbc5787c6125cc2c868eaace46c46ce6e83dcfcb6 (patch)
tree831619892302478a2ceb27d9edbffc871cf9ad26 /net/8021q
parent33a5ba144e3e7ffc1cd4a1d205e99c16078885bf (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/8021q')
-rw-r--r--net/8021q/vlan_dev.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index bc2528624583..6a4e0cb897b7 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -596,13 +596,11 @@ static u32 vlan_dev_fix_features(struct net_device *dev, u32 features)
596 struct net_device *real_dev = vlan_dev_info(dev)->real_dev; 596 struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
597 u32 old_features = features; 597 u32 old_features = features;
598 598
599 features &= real_dev->features;
600 features &= real_dev->vlan_features; 599 features &= real_dev->vlan_features;
600 features |= NETIF_F_RXCSUM;
601 features &= real_dev->features;
601 602
602 features |= old_features & NETIF_F_SOFT_FEATURES; 603 features |= old_features & NETIF_F_SOFT_FEATURES;
603
604 if (dev_ethtool_get_rx_csum(real_dev))
605 features |= NETIF_F_RXCSUM;
606 features |= NETIF_F_LLTX; 604 features |= NETIF_F_LLTX;
607 605
608 return features; 606 return features;