diff options
author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2011-11-15 16:29:55 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-11-16 23:43:10 +0100 |
commit | c8f44affb7244f2ac3e703cab13d55ede27621bb (patch) | |
tree | 62e7aea2916a8d7cab825fe500670c5113854c0f /net/bridge/br_if.c | |
parent | net: split netdev features to separate header (diff) | |
download | linux-c8f44affb7244f2ac3e703cab13d55ede27621bb.tar.xz linux-c8f44affb7244f2ac3e703cab13d55ede27621bb.zip |
net: introduce and use netdev_features_t for device features sets
v2: add couple missing conversions in drivers
split unexporting netdev_fix_features()
implemented %pNF
convert sock::sk_route_(no?)caps
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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index f603e5b0b930..0a942fbccc9a 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -296,10 +296,11 @@ int br_min_mtu(const struct net_bridge *br) /* * Recomputes features using slave's features */ -u32 br_features_recompute(struct net_bridge *br, u32 features) +netdev_features_t br_features_recompute(struct net_bridge *br, + netdev_features_t features) { struct net_bridge_port *p; - u32 mask; + netdev_features_t mask; if (list_empty(&br->port_list)) return features; |