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 /drivers/net/sfc/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 'drivers/net/sfc/ethtool.c')
-rw-r--r-- | drivers/net/sfc/ethtool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/sfc/ethtool.c index 0e8bb19ed60d..713969accdbd 100644 --- a/drivers/net/sfc/ethtool.c +++ b/drivers/net/sfc/ethtool.c | |||
@@ -502,7 +502,7 @@ static void efx_ethtool_get_stats(struct net_device *net_dev, | |||
502 | static int efx_ethtool_set_tso(struct net_device *net_dev, u32 enable) | 502 | static int efx_ethtool_set_tso(struct net_device *net_dev, u32 enable) |
503 | { | 503 | { |
504 | struct efx_nic *efx __attribute__ ((unused)) = netdev_priv(net_dev); | 504 | struct efx_nic *efx __attribute__ ((unused)) = netdev_priv(net_dev); |
505 | unsigned long features; | 505 | u32 features; |
506 | 506 | ||
507 | features = NETIF_F_TSO; | 507 | features = NETIF_F_TSO; |
508 | if (efx->type->offload_features & NETIF_F_V6_CSUM) | 508 | if (efx->type->offload_features & NETIF_F_V6_CSUM) |
@@ -519,7 +519,7 @@ static int efx_ethtool_set_tso(struct net_device *net_dev, u32 enable) | |||
519 | static int efx_ethtool_set_tx_csum(struct net_device *net_dev, u32 enable) | 519 | static int efx_ethtool_set_tx_csum(struct net_device *net_dev, u32 enable) |
520 | { | 520 | { |
521 | struct efx_nic *efx = netdev_priv(net_dev); | 521 | struct efx_nic *efx = netdev_priv(net_dev); |
522 | unsigned long features = efx->type->offload_features & NETIF_F_ALL_CSUM; | 522 | u32 features = efx->type->offload_features & NETIF_F_ALL_CSUM; |
523 | 523 | ||
524 | if (enable) | 524 | if (enable) |
525 | net_dev->features |= features; | 525 | net_dev->features |= features; |