summaryrefslogtreecommitdiffstats
path: root/net/8021q
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2013-05-01 23:06:42 +0000
committerDavid S. Miller <davem@davemloft.net>2013-05-02 13:58:12 -0400
commitb29d3145183da4e07d4b570fa8acdd3ac4a5c572 (patch)
treebdbbd0aed54884ff3c139b8e296562280b9ed1ad /net/8021q
parent6708c9e5cc9bfc7c9a00ce9c0fdd0b1d4952b3d1 (diff)
downloadlinux-stable-b29d3145183da4e07d4b570fa8acdd3ac4a5c572.tar.gz
linux-stable-b29d3145183da4e07d4b570fa8acdd3ac4a5c572.tar.bz2
linux-stable-b29d3145183da4e07d4b570fa8acdd3ac4a5c572.zip
net: vlan,ethtool: netdev_features_t is more than 32 bit
Signed-off-by: Bjørn Mork <bjorn@mork.no> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
-rw-r--r--net/8021q/vlan_dev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 8af508536d36..3a8c8fd63c88 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -628,7 +628,7 @@ static netdev_features_t vlan_dev_fix_features(struct net_device *dev,
netdev_features_t features)
{
struct net_device *real_dev = vlan_dev_priv(dev)->real_dev;
- u32 old_features = features;
+ netdev_features_t old_features = features;
features &= real_dev->vlan_features;
features |= NETIF_F_RXCSUM;