Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27a42938 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

bridge: BH already disabled in br_fdb_cleanup() 



br_fdb_cleanup() is run from timer interrupt, BH already masked.

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
CC: Stephen Hemminger <shemminger@vyatta.com>
CC: Štefan Gula <steweg@gmail.com>
Acked-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 319d3b9c

net/bridge/br_fdb.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -146,7 +146,7 @@ void br_fdb_cleanup(unsigned long _data) 
	unsigned long next_timer = jiffies + br->ageing_time;

	unsigned long next_timer = jiffies + br->ageing_time;

	int i;

	int i;





	spin_lock_bh(&br->hash_lock);

	spin_lock(&br->hash_lock);

	for (i = 0; i < BR_HASH_SIZE; i++) {

	for (i = 0; i < BR_HASH_SIZE; i++) {

		struct net_bridge_fdb_entry *f;

		struct net_bridge_fdb_entry *f;

		struct hlist_node *h, *n;

		struct hlist_node *h, *n;
@@ -162,7 +162,7 @@ void br_fdb_cleanup(unsigned long _data) 
				next_timer = this_timer;

				next_timer = this_timer;

		}

		}

	}

	}

	spin_unlock_bh(&br->hash_lock);

	spin_unlock(&br->hash_lock);





	mod_timer(&br->gc_timer, round_jiffies_up(next_timer));

	mod_timer(&br->gc_timer, round_jiffies_up(next_timer));

}

}