diff options
| author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2011-04-02 22:49:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-02 22:49:12 -0700 |
| commit | 8a0427bb688eae86a8bb939b6a74e5aa00aa035a (patch) | |
| tree | a2c8361f6eba3d97e2053e559c9f6b81693aa9aa /net/8021q/vlan.c | |
| parent | 6cb6a27c45cec9184302c2e350b3593c64bc7f6c (diff) | |
| download | kernel-common-8a0427bb688eae86a8bb939b6a74e5aa00aa035a.tar.gz kernel-common-8a0427bb688eae86a8bb939b6a74e5aa00aa035a.tar.bz2 kernel-common-8a0427bb688eae86a8bb939b6a74e5aa00aa035a.zip | |
vlan: convert VLAN devices to use ndo_fix_features()
Note: get_flags was actually broken, because it should return the
flags capped with vlan_features. This is now done implicitly by
limiting netdev->hw_features.
RX checksumming offload control is (and was) broken, as there was no way
before to say whether it's done for tagged packets.
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan.c')
| -rw-r--r-- | net/8021q/vlan.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index 7850412f52b7..e47600b4e2e3 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -327,10 +327,6 @@ static void vlan_sync_address(struct net_device *dev, static void vlan_transfer_features(struct net_device *dev, struct net_device *vlandev) { - u32 old_features = vlandev->features; - - vlandev->features &= ~dev->vlan_features; - vlandev->features |= dev->features & dev->vlan_features; vlandev->gso_max_size = dev->gso_max_size; if (dev->features & NETIF_F_HW_VLAN_TX) @@ -341,8 +337,8 @@ static void vlan_transfer_features(struct net_device *dev, #if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE) vlandev->fcoe_ddp_xid = dev->fcoe_ddp_xid; #endif - if (old_features != vlandev->features) - netdev_features_change(vlandev); + + netdev_update_features(vlandev); } static void __vlan_device_event(struct net_device *dev, unsigned long event) |