diff options
| author | David S. Miller <davem@davemloft.net> | 2010-08-03 01:22:46 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-03 01:22:46 -0400 |
| commit | 00dad5e479531e379aba7358600cc768725d4f1f (patch) | |
| tree | 652199eacee32c2cf317f5a54da8265973d29978 /net/bridge/br_fdb.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_fdb.c')
| -rw-r--r-- | net/bridge/br_fdb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index a744296fc675..90512ccfd3e9 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c | |||
| @@ -214,7 +214,7 @@ void br_fdb_delete_by_port(struct net_bridge *br, | |||
| 214 | spin_unlock_bh(&br->hash_lock); | 214 | spin_unlock_bh(&br->hash_lock); |
| 215 | } | 215 | } |
| 216 | 216 | ||
| 217 | /* No locking or refcounting, assumes caller has no preempt (rcu_read_lock) */ | 217 | /* No locking or refcounting, assumes caller has rcu_read_lock */ |
| 218 | struct net_bridge_fdb_entry *__br_fdb_get(struct net_bridge *br, | 218 | struct net_bridge_fdb_entry *__br_fdb_get(struct net_bridge *br, |
| 219 | const unsigned char *addr) | 219 | const unsigned char *addr) |
| 220 | { | 220 | { |