From 171eedcc629129296c0851ebd131794311c6f869 Mon Sep 17 00:00:00 2001
From: Andy Gospodarek <andy@greyhouse.net>
Date: Mon, 4 Dec 2006 15:04:54 -0800
Subject: [PATCH] --- yaml --- r: 43205 b: refs/heads/master c:
 4e1400796c93df5e7f92d766e4a4332d0c98795f h: refs/heads/master i:   43203:
 0d9edd2f2ecdb5359a1757bb145758be58074ac9 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/bonding/bond_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 784f8c1810a4..56f1c125bd86 100644
--- 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
index 488d8ed9e740..6482aed4bb7c 100644
--- 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);