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>

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 9757c19..daeb19d 100644 (file)
--- 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;

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 6d6d7d2..7becb3f 100644 (file)
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -1286,7 +1286,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
        void __user *useraddr = ifr->ifr_data;
        u32 ethcmd;
        int rc;
-       u32 old_features;
+       netdev_features_t old_features;
 
        if (!dev || !netif_device_present(dev))
                return -ENODEV;