Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 2 insertions, 4 deletions

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 1f08a59b51ea..3a73b8c94271 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -341,7 +341,6 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
         if (hold_time(br) == 0)
                 return;
 
-        rcu_read_lock();
         fdb = fdb_find(head, addr);
         if (likely(fdb)) {
                 /* attempt to update an entry for a local interface */
@@ -356,13 +355,12 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
                         fdb->ageing_timer = jiffies;
                 }
         } else {
-                spin_lock_bh(&br->hash_lock);
+                spin_lock(&br->hash_lock);
                 if (!fdb_find(head, addr))
                         fdb_create(head, source, addr, 0);
                 /* else  we lose race and someone else inserts
                  * it first, don't bother updating
                  */
-                spin_unlock_bh(&br->hash_lock);
+                spin_unlock(&br->hash_lock);
         }
-        rcu_read_unlock();
 }