diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-06-08 20:06:56 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-08 20:06:56 -0700 |
| commit | 941742f49762ba4c908510f036b09a46c1b14513 (patch) | |
| tree | aafb7a72c2072f98889406668003234bed56df02 /net/bridge/br_fdb.c | |
| parent | net: phy: dp83867: Fix device tree entries (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-941742f49762ba4c908510f036b09a46c1b14513.tar.xz linux-dev-941742f49762ba4c908510f036b09a46c1b14513.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/bridge/br_fdb.c')
| -rw-r--r-- | net/bridge/br_fdb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 7896cf143045..cecb482ed919 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -802,9 +802,11 @@ static int __br_fdb_add(struct ndmsg *ndm, struct net_bridge_port *p, int err = 0; if (ndm->ndm_flags & NTF_USE) { + local_bh_disable(); rcu_read_lock(); br_fdb_update(p->br, p, addr, vid, true); rcu_read_unlock(); + local_bh_enable(); } else { spin_lock_bh(&p->br->hash_lock); err = fdb_add_entry(p, addr, ndm->ndm_state, |