diff --git a/[refs] b/[refs]
index 77be71e11e68..e2b768bc1769 100644
--- 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
index 95ae11956f35..e01d57692c9a 100644
--- 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);
+	}
 }
 
 /**