---

yaml --- r: 265738 b: refs/heads/master c: c37e0c9 h: refs/heads/master v: v3
git-mirror · Sep 15, 2011 · e5a9476 · e5a9476
1 parent e94425a
commit e5a9476
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e829a784c16513ac9a1d29ad23d7753d8f40b79
+refs/heads/master: c37e0c993055d8c4fd82202331d06e6ef9bfec4b
diff --git a/trunk/net/core/link_watch.c b/trunk/net/core/link_watch.c
@@ -78,8 +78,13 @@ static void rfc2863_policy(struct net_device *dev)
 
 static bool linkwatch_urgent_event(struct net_device *dev)
 {
-	return netif_running(dev) && netif_carrier_ok(dev) &&
-		qdisc_tx_changing(dev);
+	if (!netif_running(dev))
+		return false;
+
+	if (dev->ifindex != dev->iflink)
+		return true;
+
+	return netif_carrier_ok(dev) &&	qdisc_tx_changing(dev);
 }