From faee1089c04844376773d2cfd09f85eba3dc3ae5 Mon Sep 17 00:00:00 2001 From: Jay Vosburgh Date: Fri, 21 Mar 2008 22:29:33 -0700 Subject: [PATCH] --- yaml --- r: 87811 b: refs/heads/master c: 2bf86b7aa8e74bf81a9872f7b610f49b610a4649 h: refs/heads/master i: 87809: 4fe3705636211afc9b17fe8df10be66ca0b7d83b 87807: 35307a3dbd22aa815cc9d3cbcb21da4ccccee7fe v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_3ad.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a0b8ce55b369..cd76eb52afb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26c080bf8308449330037f91daa3ac0a7c41023e +refs/heads/master: 2bf86b7aa8e74bf81a9872f7b610f49b610a4649 diff --git a/trunk/drivers/net/bonding/bond_3ad.c b/trunk/drivers/net/bonding/bond_3ad.c index cb3c6faa7888..d16e0e1d2b30 100644 --- a/trunk/drivers/net/bonding/bond_3ad.c +++ b/trunk/drivers/net/bonding/bond_3ad.c @@ -310,7 +310,7 @@ static inline int __check_agg_selection_timer(struct port *port) */ static inline void __get_rx_machine_lock(struct port *port) { - spin_lock(&(SLAVE_AD_INFO(port->slave).rx_machine_lock)); + spin_lock_bh(&(SLAVE_AD_INFO(port->slave).rx_machine_lock)); } /** @@ -320,7 +320,7 @@ static inline void __get_rx_machine_lock(struct port *port) */ static inline void __release_rx_machine_lock(struct port *port) { - spin_unlock(&(SLAVE_AD_INFO(port->slave).rx_machine_lock)); + spin_unlock_bh(&(SLAVE_AD_INFO(port->slave).rx_machine_lock)); } /**