[PATCH] net: vlan,ethtool: netdev_features_t is more than 32 bit

[=3D?UTF-8?q?Bj=3DC3=3DB8rn=3D20Mork?=3D]

Signed-off-by: Bj=C3=B8rn Mork <bjorn@xxxxxxx>
---
 net/8021q/vlan_dev.c |    2 +-
 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 8af5085..3a8c8fd 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 n=
et_device *dev,
 	netdev_features_t features)
 {
 	struct net_device *real_dev =3D vlan_dev_priv(dev)->real_dev;
-	u32 old_features =3D features;
+	netdev_features_t old_features =3D features;
=20
 	features &=3D real_dev->vlan_features;
 	features |=3D NETIF_F_RXCSUM;
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 5a934ef..22efdaa 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -1421,7 +1421,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
 	void __user *useraddr =3D ifr->ifr_data;
 	u32 ethcmd;
 	int rc;
-	u32 old_features;
+	netdev_features_t old_features;
=20
 	if (!dev || !netif_device_present(dev))
 		return -ENODEV;
--=20
1.7.10.4


--=-=-=--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/