diff --git a/[refs] b/[refs]
index 5f13c9ca046b..b8568c395aa1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63f4e1903ae41b4e457dd4490afe0f59e7641ad6
+refs/heads/master: 18543a643fae694982c7d89c22436885f3506497
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index 072652d94d9f..d8fd2c23a1b9 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -1554,6 +1554,11 @@ static inline void netif_tx_wake_all_queues(struct net_device *dev)
 
 static inline void netif_tx_stop_queue(struct netdev_queue *dev_queue)
 {
+	if (WARN_ON(!dev_queue)) {
+		printk(KERN_INFO "netif_stop_queue() cannot be called before "
+		       "register_netdev()");
+		return;
+	}
 	set_bit(__QUEUE_STATE_XOFF, &dev_queue->state);
 }