From b337260947686bb3145538b1d0b79062a6bb0d9e Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 19 Nov 2008 15:33:54 -0800
Subject: [PATCH] --- yaml --- r: 119240 b: refs/heads/master c:
 b47300168e770b60ab96c8924854c3b0eb4260eb h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/net/sched/sch_generic.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 31f6fd0e98af..d05f3d780f7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 566521d63720ab47576afb85147e5652993bf1e6
+refs/heads/master: b47300168e770b60ab96c8924854c3b0eb4260eb
diff --git a/trunk/net/sched/sch_generic.c b/trunk/net/sched/sch_generic.c
index 93cd30ce6501..cdcd16fcfeda 100644
--- a/trunk/net/sched/sch_generic.c
+++ b/trunk/net/sched/sch_generic.c
@@ -270,6 +270,8 @@ 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 (dev->reg_state == NETREG_UNINITIALIZED)
+			return;
 		linkwatch_fire_event(dev);
 		if (netif_running(dev))
 			__netdev_watchdog_up(dev);
@@ -285,8 +287,11 @@ EXPORT_SYMBOL(netif_carrier_on);
  */
 void netif_carrier_off(struct net_device *dev)
 {
-	if (!test_and_set_bit(__LINK_STATE_NOCARRIER, &dev->state))
+	if (!test_and_set_bit(__LINK_STATE_NOCARRIER, &dev->state)) {
+		if (dev->reg_state == NETREG_UNINITIALIZED)
+			return;
 		linkwatch_fire_event(dev);
+	}
 }
 EXPORT_SYMBOL(netif_carrier_off);