From ea814349c9d0f0f8b3ca8804e6aec69e7df82b36 Mon Sep 17 00:00:00 2001 From: "nikolay@redhat.com" Date: Mon, 18 Feb 2013 07:59:02 +0000 Subject: [PATCH] --- yaml --- r: 352783 b: refs/heads/master c: b59340c2c0508d280f10658ad662fa56a39c74c2 h: refs/heads/master i: 352781: b45a1a09fab01f6413a92e84a7ad96161e98b1ac 352779: fd7dc90344cf194a855addc06e793ddf383d37ae 352775: 2df9e5438df0364aa0861ef4bb640beeecc0b553 352767: 586b3a985979b1c91ded6a97c72d728d6a607b4b v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_3ad.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 514fa10547be..81cbeb092530 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ccae0e50c16a7f7adb029c169147400d1ce9f703 +refs/heads/master: b59340c2c0508d280f10658ad662fa56a39c74c2 diff --git a/trunk/drivers/net/bonding/bond_3ad.c b/trunk/drivers/net/bonding/bond_3ad.c index 84fabd69df4c..0e45b400b6fc 100644 --- a/trunk/drivers/net/bonding/bond_3ad.c +++ b/trunk/drivers/net/bonding/bond_3ad.c @@ -2494,11 +2494,13 @@ void bond_3ad_update_lacp_rate(struct bonding *bond) struct port *port = NULL; int lacp_fast; - read_lock(&bond->lock); + write_lock_bh(&bond->lock); lacp_fast = bond->params.lacp_fast; bond_for_each_slave(bond, slave, i) { port = &(SLAVE_AD_INFO(slave).port); + if (port->slave == NULL) + continue; __get_state_machine_lock(port); if (lacp_fast) port->actor_oper_port_state |= AD_STATE_LACP_TIMEOUT; @@ -2507,5 +2509,5 @@ void bond_3ad_update_lacp_rate(struct bonding *bond) __release_state_machine_lock(port); } - read_unlock(&bond->lock); + write_unlock_bh(&bond->lock); }