summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-11-08 23:38:28 +0300
committerDavid S. Miller <davem@davemloft.net>2010-11-08 23:38:28 +0300
commitd0eaeec8e8dfdc31815941054802dcccd7c3fe1d (patch)
treed7b0d172b7b9b3476c15e2cb001af2d4f8b6a39e /include/linux
parenta7bcf21e60c73cb7f7c13fad928967d7e47c3cac (diff)
parentaa58163a76a3aef33c7220931543d45d0fe43753 (diff)
downloadlinux-d0eaeec8e8dfdc31815941054802dcccd7c3fe1d.tar.xz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/netdevice.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 072652d94d9f..d8fd2c23a1b9 100644
--- a/include/linux/netdevice.h
+++ b/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);
}