diff options
Diffstat (limited to 'net/bridge/br_fdb.c')
-rw-r--r-- | net/bridge/br_fdb.c | 6 |
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, | |||
341 | if (hold_time(br) == 0) | 341 | if (hold_time(br) == 0) |
342 | return; | 342 | return; |
343 | 343 | ||
344 | rcu_read_lock(); | ||
345 | fdb = fdb_find(head, addr); | 344 | fdb = fdb_find(head, addr); |
346 | if (likely(fdb)) { | 345 | if (likely(fdb)) { |
347 | /* attempt to update an entry for a local interface */ | 346 | /* 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, | |||
356 | fdb->ageing_timer = jiffies; | 355 | fdb->ageing_timer = jiffies; |
357 | } | 356 | } |
358 | } else { | 357 | } else { |
359 | spin_lock_bh(&br->hash_lock); | 358 | spin_lock(&br->hash_lock); |
360 | if (!fdb_find(head, addr)) | 359 | if (!fdb_find(head, addr)) |
361 | fdb_create(head, source, addr, 0); | 360 | fdb_create(head, source, addr, 0); |
362 | /* else we lose race and someone else inserts | 361 | /* else we lose race and someone else inserts |
363 | * it first, don't bother updating | 362 | * it first, don't bother updating |
364 | */ | 363 | */ |
365 | spin_unlock_bh(&br->hash_lock); | 364 | spin_unlock(&br->hash_lock); |
366 | } | 365 | } |
367 | rcu_read_unlock(); | ||
368 | } | 366 | } |