From: Patrick McHardy <kaber@trash.net>
Date: Mon, 21 Jan 2008 08:47:08 +0000 (-0800)
Subject: [MACVLAN]: Fix thinko in macvlan_transfer_operstate()
X-Git-Tag: v2.6.25-rc1~1162^2~232
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f12ca5f97b7f99288aff1dc32a91f21c3230fefe;p=linux-2.6-omap-h63xx.git

[MACVLAN]: Fix thinko in macvlan_transfer_operstate()

When the lower device's carrier is off, the macvlan devices's
carrier state should be checked to decide whether it needs to
be turned off. Currently the lower device's state is checked
a second time.

This still works, but unnecessarily tries to turn off the
carrier when its already off.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index b7c9791009d..6ef6b8b39e7 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -375,7 +375,7 @@ static void macvlan_transfer_operstate(struct net_device *dev)
 		if (!netif_carrier_ok(dev))
 			netif_carrier_on(dev);
 	} else {
-		if (netif_carrier_ok(lowerdev))
+		if (netif_carrier_ok(dev))
 			netif_carrier_off(dev);
 	}
 }