diff options
| author | Bjørn Mork <bjorn@mork.no> | 2013-05-01 23:06:42 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-19 10:54:45 -0700 |
| commit | 074d34feb18f1439e13053d0869df368e8ea2107 (patch) | |
| tree | c667ca332f8e4818e8efe0f3b45b280c5747de25 /net/8021q/vlan_dev.c | |
| parent | 7433ca9c45b8a8c98de9cd57f84d107d05925102 (diff) | |
net: vlan,ethtool: netdev_features_t is more than 32 bit
[ Upstream commit b29d3145183da4e07d4b570fa8acdd3ac4a5c572 ]
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/8021q/vlan_dev.c')
| -rw-r--r-- | net/8021q/vlan_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 9757c193c86..daeb19d32bd 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -598,7 +598,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; |