diff options
author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2011-01-24 18:32:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-24 18:32:47 -0500 |
commit | 04ed3e741d0f133e02bed7fa5c98edba128f90e7 (patch) | |
tree | 3dde4ca8306e98536faa69bccf0e47a2549c088f /net/core/ethtool.c | |
parent | 57422dc530115e427dff464cc0a32bcd0efb5008 (diff) |
net: change netdev->features to u32
Quoting Ben Hutchings: we presumably won't be defining features that
can only be enabled on 64-bit architectures.
Occurences found by `grep -r` on net/, drivers/net, include/
[ Move features and vlan_features next to each other in
struct netdev, as per Eric Dumazet's suggestion -DaveM ]
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/ethtool.c')
-rw-r--r-- | net/core/ethtool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 17741782a345..bd1af99e1122 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c | |||
@@ -1458,7 +1458,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr) | |||
1458 | void __user *useraddr = ifr->ifr_data; | 1458 | void __user *useraddr = ifr->ifr_data; |
1459 | u32 ethcmd; | 1459 | u32 ethcmd; |
1460 | int rc; | 1460 | int rc; |
1461 | unsigned long old_features; | 1461 | u32 old_features; |
1462 | 1462 | ||
1463 | if (!dev || !netif_device_present(dev)) | 1463 | if (!dev || !netif_device_present(dev)) |
1464 | return -ENODEV; | 1464 | return -ENODEV; |