From 65c4c910f94e1dbe85e7011134dd8d9f8a9446c2 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Mon, 21 Jan 2008 00:47:08 -0800
Subject: [PATCH] --- yaml --- r: 79316 b: refs/heads/master c:
 f12ca5f97b7f99288aff1dc32a91f21c3230fefe h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ec61d4a2dc1b..a03268602ed0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91b4f954759653272504c55b715b757207ed1700
+refs/heads/master: f12ca5f97b7f99288aff1dc32a91f21c3230fefe
diff --git a/trunk/drivers/net/macvlan.c b/trunk/drivers/net/macvlan.c
index b7c9791009d0..6ef6b8b39e71 100644
--- a/trunk/drivers/net/macvlan.c
+++ b/trunk/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);
 	}
 }