From c6f116d09a690d0eb2fb746ed8b07da862fdb83b Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Wed, 17 Oct 2007 23:26:43 -0700 Subject: [PATCH] --- yaml --- r: 71295 b: refs/heads/master c: bfaae0f04c68bafc12ec50c6922d71a90deea3e2 h: refs/heads/master i: 71293: 2551e13b4419f540a9cf077c18af3cad0418021b 71291: b0048e4cab66a9fd3243cf7b838af626cc704e36 71287: 7fc7bda4f0ba32010467f5bf8c52616f6f600f42 71279: 40d23944773ff571dfcde8dbea811d3f84763a59 71263: 7724e2d30328839e4f67475a010b2624d9337e9e 71231: 2c85cb69b0922256cf4507555f7d94bcae4baf01 71167: f069433b38610cd72b9b383f1c96bf05a5c7eb47 v: v3 --- [refs] | 2 +- trunk/net/sched/sch_generic.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) 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); + } } /**