diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-08 23:38:28 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-08 23:38:28 +0300 |
| commit | d0eaeec8e8dfdc31815941054802dcccd7c3fe1d (patch) | |
| tree | d7b0d172b7b9b3476c15e2cb001af2d4f8b6a39e /include | |
| parent | a7bcf21e60c73cb7f7c13fad928967d7e47c3cac (diff) | |
| parent | aa58163a76a3aef33c7220931543d45d0fe43753 (diff) | |
| download | linux-d0eaeec8e8dfdc31815941054802dcccd7c3fe1d.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netdevice.h | 5 | ||||
| -rw-r--r-- | include/net/dst_ops.h | 1 |
2 files changed, 6 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); } diff --git a/include/net/dst_ops.h b/include/net/dst_ops.h index 1fa5306e3e23..51665b3461b8 100644 --- a/include/net/dst_ops.h +++ b/include/net/dst_ops.h @@ -2,6 +2,7 @@ #define _NET_DST_OPS_H #include <linux/types.h> #include <linux/percpu_counter.h> +#include <linux/cache.h> struct dst_entry; struct kmem_cachep; |