---

yaml --- r: 43205 b: refs/heads/master c: 4e14007 h: refs/heads/master i: 43203: 0d9edd2 v: v3
git-mirror · Dec 4, 2006 · 171eedc · 171eedc
1 parent 568055f
commit 171eedc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33fee56ae846cdee67d2ab6d14c3baa879dfc794
+refs/heads/master: 4e1400796c93df5e7f92d766e4a4332d0c98795f
diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c
@@ -3684,7 +3684,7 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
 			mii->val_out = 0;
 			read_lock_bh(&bond->lock);
 			read_lock(&bond->curr_slave_lock);
-			if (bond->curr_active_slave) {
+			if (netif_carrier_ok(bond->dev)) {
 				mii->val_out = BMSR_LSTATUS;
 			}
 			read_unlock(&bond->curr_slave_lock);