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/bridge/br_if.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/bridge/br_if.c')
-rw-r--r-- | net/bridge/br_if.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index d9d1e2bac1d6..52ce4a30f8b3 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c | |||
@@ -365,7 +365,7 @@ int br_min_mtu(const struct net_bridge *br) | |||
365 | void br_features_recompute(struct net_bridge *br) | 365 | void br_features_recompute(struct net_bridge *br) |
366 | { | 366 | { |
367 | struct net_bridge_port *p; | 367 | struct net_bridge_port *p; |
368 | unsigned long features, mask; | 368 | u32 features, mask; |
369 | 369 | ||
370 | features = mask = br->feature_mask; | 370 | features = mask = br->feature_mask; |
371 | if (list_empty(&br->port_list)) | 371 | if (list_empty(&br->port_list)) |