diff options
| author | Bjørn Mork <bjorn@mork.no> | 2013-05-01 23:06:42 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-02 13:58:12 -0400 |
| commit | b29d3145183da4e07d4b570fa8acdd3ac4a5c572 (patch) | |
| tree | bdbbd0aed54884ff3c139b8e296562280b9ed1ad | |
| parent | 6708c9e5cc9bfc7c9a00ce9c0fdd0b1d4952b3d1 (diff) | |
| download | op-kernel-dev-b29d3145183da4e07d4b570fa8acdd3ac4a5c572.zip op-kernel-dev-b29d3145183da4e07d4b570fa8acdd3ac4a5c572.tar.gz | |
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>
| -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 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 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 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 = ifr->ifr_data; u32 ethcmd; int rc; - u32 old_features; + netdev_features_t old_features; if (!dev || !netif_device_present(dev)) return -ENODEV; |
