1 files changed, 4 insertions, 0 deletions

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 8c01e023f02e..9a2f8e41a26e 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -539,6 +539,10 @@ void dev_activate(struct net_device *dev)
                 write_unlock_bh(&qdisc_tree_lock);
         }
 
+        if (!netif_carrier_ok(dev))
+                /* Delay activation until next carrier-on event */
+                return;
+
         spin_lock_bh(&dev->queue_lock);
         rcu_assign_pointer(dev->qdisc, dev->qdisc_sleeping);
         if (dev->qdisc != &noqueue_qdisc) {