Commit b29d3145 authored by Bjørn Mork's avatar Bjørn Mork Committed by David S. Miller
Browse files

net: vlan,ethtool: netdev_features_t is more than 32 bit


Signed-off-by: default avatarBjørn Mork <bjorn@mork.no>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6708c9e5
...@@ -628,7 +628,7 @@ static netdev_features_t vlan_dev_fix_features(struct net_device *dev, ...@@ -628,7 +628,7 @@ static netdev_features_t vlan_dev_fix_features(struct net_device *dev,
netdev_features_t features) netdev_features_t features)
{ {
struct net_device *real_dev = vlan_dev_priv(dev)->real_dev; 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 &= real_dev->vlan_features;
features |= NETIF_F_RXCSUM; features |= NETIF_F_RXCSUM;
......
...@@ -1421,7 +1421,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr) ...@@ -1421,7 +1421,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
void __user *useraddr = ifr->ifr_data; void __user *useraddr = ifr->ifr_data;
u32 ethcmd; u32 ethcmd;
int rc; int rc;
u32 old_features; netdev_features_t old_features;
if (!dev || !netif_device_present(dev)) if (!dev || !netif_device_present(dev))
return -ENODEV; return -ENODEV;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment