---

yaml --- r: 71295 b: refs/heads/master c: bfaae0f h: refs/heads/master i: 71293: 2551e13 71291: b0048e4 71287: 7fc7bda 71279: 40d2394 71263: 7724e2d 71231: 2c85cb6 71167: f069433 v: v3
git-mirror · Oct 18, 2007 · c6f116d · c6f116d
1 parent da5447e
commit c6f116d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45542479fb261342d5244869cf3ca4636b7ffd43
+refs/heads/master: bfaae0f04c68bafc12ec50c6922d71a90deea3e2
diff --git a/trunk/net/sched/sch_generic.c b/trunk/net/sched/sch_generic.c
@@ -249,10 +249,11 @@ static void dev_watchdog_down(struct net_device *dev)
  */
 void netif_carrier_on(struct net_device *dev)
 {
-	if (test_and_clear_bit(__LINK_STATE_NOCARRIER, &dev->state))
+	if (test_and_clear_bit(__LINK_STATE_NOCARRIER, &dev->state)) {
 		linkwatch_fire_event(dev);
-	if (netif_running(dev))
-		__netdev_watchdog_up(dev);
+		if (netif_running(dev))
+			__netdev_watchdog_up(dev);
+	}
 }
 
 /**