diff options
Diffstat (limited to 'net/8021q/vlan.c')
-rw-r--r-- | net/8021q/vlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index 6e64f7c6a2e9..7850412f52b7 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c | |||
@@ -327,7 +327,7 @@ static void vlan_sync_address(struct net_device *dev, | |||
327 | static void vlan_transfer_features(struct net_device *dev, | 327 | static void vlan_transfer_features(struct net_device *dev, |
328 | struct net_device *vlandev) | 328 | struct net_device *vlandev) |
329 | { | 329 | { |
330 | unsigned long old_features = vlandev->features; | 330 | u32 old_features = vlandev->features; |
331 | 331 | ||
332 | vlandev->features &= ~dev->vlan_features; | 332 | vlandev->features &= ~dev->vlan_features; |
333 | vlandev->features |= dev->features & dev->vlan_features; | 333 | vlandev->features |= dev->features & dev->vlan_features; |