Patchwork bridge: BH already disabled in br_fdb_cleanup()

login
register
mail settings
Submitter Eric Dumazet
Date Jan. 16, 2012, 2:35 p.m.
Message ID <1326724550.2255.47.camel@edumazet-HP-Compaq-6005-Pro-SFF-PC>
Download mbox | patch
Permalink /patch/136278/
State Accepted
Delegated to: David Miller
Headers show

Comments

Eric Dumazet - Jan. 16, 2012, 2:35 p.m.
br_fdb_cleanup() is run from timer interrupt, BH already masked.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Stephen Hemminger <shemminger@vyatta.com>
CC: Štefan Gula <steweg@gmail.com>
---
 net/bridge/br_fdb.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)



--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
stephen hemminger - Jan. 16, 2012, 3:53 p.m.
On Mon, 16 Jan 2012 15:35:50 +0100
Eric Dumazet <eric.dumazet@gmail.com> wrote:

> br_fdb_cleanup() is run from timer interrupt, BH already masked.
> 
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
> CC: Stephen Hemminger <shemminger@vyatta.com>
> CC: Štefan Gula <steweg@gmail.com>
> ---
>  net/bridge/br_fdb.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
> index f963f6b..5ba0c84 100644
> --- a/net/bridge/br_fdb.c
> +++ b/net/bridge/br_fdb.c
> @@ -146,7 +146,7 @@ void br_fdb_cleanup(unsigned long _data)
>  	unsigned long next_timer = jiffies + br->ageing_time;
>  	int i;
>  
> -	spin_lock_bh(&br->hash_lock);
> +	spin_lock(&br->hash_lock);
>  	for (i = 0; i < BR_HASH_SIZE; i++) {
>  		struct net_bridge_fdb_entry *f;
>  		struct hlist_node *h, *n;
> @@ -162,7 +162,7 @@ void br_fdb_cleanup(unsigned long _data)
>  				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));
>  }
> 
> 

Acked-by: Stephen Hemminger <shemminger@vyatta.com>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Jan. 17, 2012, 3:17 p.m.
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Mon, 16 Jan 2012 07:53:49 -0800

> On Mon, 16 Jan 2012 15:35:50 +0100
> Eric Dumazet <eric.dumazet@gmail.com> wrote:
> 
>> br_fdb_cleanup() is run from timer interrupt, BH already masked.
>> 
>> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
 ...
> Acked-by: Stephen Hemminger <shemminger@vyatta.com>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index f963f6b..5ba0c84 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -146,7 +146,7 @@  void br_fdb_cleanup(unsigned long _data)
 	unsigned long next_timer = jiffies + br->ageing_time;
 	int i;
 
-	spin_lock_bh(&br->hash_lock);
+	spin_lock(&br->hash_lock);
 	for (i = 0; i < BR_HASH_SIZE; i++) {
 		struct net_bridge_fdb_entry *f;
 		struct hlist_node *h, *n;
@@ -162,7 +162,7 @@  void br_fdb_cleanup(unsigned long _data)
 				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));
 }