diff options
| author | David S. Miller <davem@davemloft.net> | 2010-08-02 22:22:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-02 22:22:46 -0700 |
| commit | 00dad5e479531e379aba7358600cc768725d4f1f (patch) | |
| tree | 652199eacee32c2cf317f5a54da8265973d29978 /net/bridge/br_stp_bpdu.c | |
| parent | c477d0447db08068a497e7beb892b2b2a7bff64b (diff) | |
| parent | 3a3dfb062c2e086c202d34f09ce29634515ad256 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000e/hw.h
net/bridge/br_device.c
net/bridge/br_input.c
Diffstat (limited to 'net/bridge/br_stp_bpdu.c')
| -rw-r--r-- | net/bridge/br_stp_bpdu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_stp_bpdu.c b/net/bridge/br_stp_bpdu.c index 70aecb48fb6..35cf27087b5 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) |