Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit b29d3145183da4e07d4b570fa8acdd3ac4a5c572

Authored by Bjørn Mork
Committed by David S. Miller
1 parent 6708c9e5cc
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

net/8021q/vlan_dev.c
Diff comments   View file @ b29d314
... ... @@ -628,7 +628,7 @@
628 628 netdev_features_t features)
629 629 {
630 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 633 features &= real_dev->vlan_features;
634 634 features |= NETIF_F_RXCSUM;
... ... @@ -1421,7 +1421,7 @@
1421 1421 void __user *useraddr = ifr->ifr_data;
1422 1422 u32 ethcmd;
1423 1423 int rc;
1424   - u32 old_features;
  1424 + netdev_features_t old_features;
1425 1425  
1426 1426 if (!dev || !netif_device_present(dev))
1427 1427 return -ENODEV;