diff options
author | Bjørn Mork <bjorn@mork.no> | 2013-05-01 19:06:42 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-05-02 13:58:12 -0400 |
commit | b29d3145183da4e07d4b570fa8acdd3ac4a5c572 (patch) | |
tree | bdbbd0aed54884ff3c139b8e296562280b9ed1ad /net | |
parent | 6708c9e5cc9bfc7c9a00ce9c0fdd0b1d4952b3d1 (diff) |
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')
-rw-r--r-- | net/8021q/vlan_dev.c | 2 | ||||
-rw-r--r-- | net/core/ethtool.c | 2 |
2 files changed, 2 insertions, 2 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, | |||
628 | netdev_features_t features) | 628 | netdev_features_t features) |
629 | { | 629 | { |
630 | struct net_device *real_dev = vlan_dev_priv(dev)->real_dev; | 630 | struct net_device *real_dev = vlan_dev_priv(dev)->real_dev; |
631 | u32 old_features = features; | 631 | netdev_features_t old_features = features; |
632 | 632 | ||
633 | features &= real_dev->vlan_features; | 633 | features &= real_dev->vlan_features; |
634 | features |= NETIF_F_RXCSUM; | 634 | features |= NETIF_F_RXCSUM; |
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 5a934ef90f8b..22efdaa76ebf 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c | |||
@@ -1421,7 +1421,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr) | |||
1421 | void __user *useraddr = ifr->ifr_data; | 1421 | void __user *useraddr = ifr->ifr_data; |
1422 | u32 ethcmd; | 1422 | u32 ethcmd; |
1423 | int rc; | 1423 | int rc; |
1424 | u32 old_features; | 1424 | netdev_features_t old_features; |
1425 | 1425 | ||
1426 | if (!dev || !netif_device_present(dev)) | 1426 | if (!dev || !netif_device_present(dev)) |
1427 | return -ENODEV; | 1427 | return -ENODEV; |