git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[sfrench/cifs-2.6.git]
/
net
/
bridge
/
br_stp_bpdu.c
diff --git
a/net/bridge/br_stp_bpdu.c
b/net/bridge/br_stp_bpdu.c
index 70aecb48fb69b80e608e65af295645f984b3acd4..35cf27087b561d6e9955fd75b4b03213a6e9e8d8 100644
(file)
--- 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)