aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge/br_stp_bpdu.c
diff options
context:
space:
mode:
authorstephen hemminger <shemminger@vyatta.com>2010-07-27 08:26:30 +0000
committerDavid S. Miller <davem@davemloft.net>2010-07-28 10:50:55 -0700
commiteeaf61d8891f9c9ed12c1a667e72bf83f0857954 (patch)
treedaeda447800df1349559268d8f6e79c90dcd22dd /net/bridge/br_stp_bpdu.c
parente1000e: 82577/82578 PHY register access issues (diff)
downloadlinux-dev-eeaf61d8891f9c9ed12c1a667e72bf83f0857954.tar.xz
linux-dev-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_stp_bpdu.c')
-rw-r--r--net/bridge/br_stp_bpdu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_stp_bpdu.c b/net/bridge/br_stp_bpdu.c
index 217bd225a42f..5854e8285a9c 100644
--- a/net/bridge/br_stp_bpdu.c
+++ b/net/bridge/br_stp_bpdu.c
@@ -131,7 +131,7 @@ void br_send_tcn_bpdu(struct net_bridge_port *p)
/*
* Called from llc.
*
- * NO locks, but rcu_read_lock (preempt_disabled)
+ * NO locks, but rcu_read_lock
*/
void br_stp_rcv(const struct stp_proto *proto, struct sk_buff *skb,
struct net_device *dev)