From d1ebd88996c6bcd7db12667613bf68f08b1b6a77 Mon Sep 17 00:00:00 2001 From: Karsten Keil Date: Fri, 29 Sep 2006 23:28:42 -0700 Subject: [PATCH] --- yaml --- r: 39402 b: refs/heads/master c: 39984a9fad0c642182f426d7771332d46f222103 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_alb.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d9d9c911e316..1f2a871762c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a07bc645e818b88559d99f52ad45e35352e8228 +refs/heads/master: 39984a9fad0c642182f426d7771332d46f222103 diff --git a/trunk/drivers/net/bonding/bond_alb.c b/trunk/drivers/net/bonding/bond_alb.c index e83bc825f6af..32923162179e 100644 --- a/trunk/drivers/net/bonding/bond_alb.c +++ b/trunk/drivers/net/bonding/bond_alb.c @@ -1433,7 +1433,7 @@ void bond_alb_monitor(struct bonding *bond) * write lock to protect from other code that also * sets the promiscuity. */ - write_lock(&bond->curr_slave_lock); + write_lock_bh(&bond->curr_slave_lock); if (bond_info->primary_is_promisc && (++bond_info->rlb_promisc_timeout_counter >= RLB_PROMISC_TIMEOUT)) { @@ -1448,7 +1448,7 @@ void bond_alb_monitor(struct bonding *bond) bond_info->primary_is_promisc = 0; } - write_unlock(&bond->curr_slave_lock); + write_unlock_bh(&bond->curr_slave_lock); if (bond_info->rlb_rebalance) { bond_info->rlb_rebalance = 0;