diff options
| author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2011-04-22 06:31:16 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-28 13:33:08 -0700 |
| commit | c4d27ef957cd9261c0bc8488edaf8390e412cd35 (patch) | |
| tree | f8e263ca9a1842803a2265bffd5eaa3e5b3d9660 /net/bridge/br_private.h | |
| parent | 1742f183fc218798dab6fcf0ded25b6608fc0a48 (diff) | |
| download | kernel_samsung_smdk4412-c4d27ef957cd9261c0bc8488edaf8390e412cd35.zip kernel_samsung_smdk4412-c4d27ef957cd9261c0bc8488edaf8390e412cd35.tar.gz kernel_samsung_smdk4412-c4d27ef957cd9261c0bc8488edaf8390e412cd35.tar.bz2 | |
bridge: convert br_features_recompute() to ndo_fix_features
Note: netdev_update_features() needs only rtnl_lock as br->port_list
is only changed while holding it.
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_private.h')
| -rw-r--r-- | net/bridge/br_private.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index e2a4034..54578f2 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -183,7 +183,6 @@ struct net_bridge struct br_cpu_netstats __percpu *stats; spinlock_t hash_lock; struct hlist_head hash[BR_HASH_SIZE]; - u32 feature_mask; #ifdef CONFIG_BRIDGE_NETFILTER struct rtable fake_rtable; bool nf_call_iptables; @@ -379,7 +378,7 @@ extern int br_add_if(struct net_bridge *br, extern int br_del_if(struct net_bridge *br, struct net_device *dev); extern int br_min_mtu(const struct net_bridge *br); -extern void br_features_recompute(struct net_bridge *br); +extern u32 br_features_recompute(struct net_bridge *br, u32 features); /* br_input.c */ extern int br_handle_frame_finish(struct sk_buff *skb); |