diff options
author | stephen hemminger <shemminger@vyatta.com> | 2010-07-27 08:26:30 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-07-28 10:50:55 -0700 |
commit | eeaf61d8891f9c9ed12c1a667e72bf83f0857954 (patch) | |
tree | daeda447800df1349559268d8f6e79c90dcd22dd /net/bridge/br_input.c | |
parent | ff847ac2d3e90edd94674c28bade25ae1e6a2e49 (diff) | |
download | linux-stable-eeaf61d8891f9c9ed12c1a667e72bf83f0857954.tar.gz linux-stable-eeaf61d8891f9c9ed12c1a667e72bf83f0857954.tar.bz2 linux-stable-eeaf61d8891f9c9ed12c1a667e72bf83f0857954.zip |
bridge: add rcu_read_lock on transmit
Long ago, when bridge was converted to RCU, rcu lock was equivalent
to having preempt disabled. RCU has changed a lot since then and
bridge code was still assuming the since transmit was called with
bottom half disabled, it was RCU safe.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Tested-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_input.c')
-rw-r--r-- | net/bridge/br_input.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index d36e700f7a26..114365c9eb1c 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c @@ -37,7 +37,7 @@ static int br_pass_frame_up(struct sk_buff *skb) netif_receive_skb); } -/* note: already called with rcu_read_lock (preempt_disabled) */ +/* note: already called with rcu_read_lock */ int br_handle_frame_finish(struct sk_buff *skb) { const unsigned char *dest = eth_hdr(skb)->h_dest; @@ -108,7 +108,7 @@ drop: goto out; } -/* note: already called with rcu_read_lock (preempt_disabled) */ +/* note: already called with rcu_read_lock */ static int br_handle_local_finish(struct sk_buff *skb) { struct net_bridge_port *p = rcu_dereference(skb->dev->br_port); @@ -133,7 +133,7 @@ static inline int is_link_local(const unsigned char *dest) /* * Called via br_handle_frame_hook. * Return NULL if skb is handled - * note: already called with rcu_read_lock (preempt_disabled) + * note: already called with rcu_read_lock */ struct sk_buff *br_handle_frame(struct net_bridge_port *p, struct sk_buff *skb) { |