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/myri10ge/myri10ge.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/myri10ge/myri10ge.c')
-rw-r--r-- | drivers/net/myri10ge/myri10ge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index ea5cfe2c3a04..a7f2eed9a08a 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c | |||
@@ -253,7 +253,7 @@ struct myri10ge_priv { | |||
253 | unsigned long serial_number; | 253 | unsigned long serial_number; |
254 | int vendor_specific_offset; | 254 | int vendor_specific_offset; |
255 | int fw_multicast_support; | 255 | int fw_multicast_support; |
256 | unsigned long features; | 256 | u32 features; |
257 | u32 max_tso6; | 257 | u32 max_tso6; |
258 | u32 read_dma; | 258 | u32 read_dma; |
259 | u32 write_dma; | 259 | u32 write_dma; |
@@ -1776,7 +1776,7 @@ static int myri10ge_set_rx_csum(struct net_device *netdev, u32 csum_enabled) | |||
1776 | static int myri10ge_set_tso(struct net_device *netdev, u32 tso_enabled) | 1776 | static int myri10ge_set_tso(struct net_device *netdev, u32 tso_enabled) |
1777 | { | 1777 | { |
1778 | struct myri10ge_priv *mgp = netdev_priv(netdev); | 1778 | struct myri10ge_priv *mgp = netdev_priv(netdev); |
1779 | unsigned long flags = mgp->features & (NETIF_F_TSO6 | NETIF_F_TSO); | 1779 | u32 flags = mgp->features & (NETIF_F_TSO6 | NETIF_F_TSO); |
1780 | 1780 | ||
1781 | if (tso_enabled) | 1781 | if (tso_enabled) |
1782 | netdev->features |= flags; | 1782 | netdev->features |= flags; |