diff options
| author | David S. Miller <davem@davemloft.net> | 2016-08-10 17:19:07 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-10 17:19:07 -0700 |
| commit | 084c9535aab61ddd0e55eb796baa6b078b3843b1 (patch) | |
| tree | f643eab05a5617402f6f995b0304d3fbfa48570e /include/linux | |
| parent | b89b815c32f205a772180969da0188665f7da9e8 (diff) | |
| parent | 59cc1f61f09c26ce82c308e24b76141e1efe99f8 (diff) | |
Merge branch 'qdisc-hashtable'
Jiri Kosina says:
====================
Convert qdisc linked list into a hashtable
This is a respin of the v6 of the original patch [1], split into two-patch
series as requested by davem; first patch fixes all symbol conflicts
that'd happen once netdevice.h starts to include hashtable.h, the second
one performs the actual switch to hashtable.
I've preserved Cong's Reviewed-by:, as code-wise this series is identical
to the original v6 of the patch.
[1] lkml.kernel.org/r/alpine.LNX.2.00.1608011220580.22028@cbobk.fhfr.pm
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 076df5360ba5..96e0b6cd964e 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -52,6 +52,7 @@ #include <uapi/linux/netdevice.h> #include <uapi/linux/if_bonding.h> #include <uapi/linux/pkt_cls.h> +#include <linux/hashtable.h> struct netpoll_info; struct device; @@ -1800,6 +1801,9 @@ struct net_device { unsigned int num_tx_queues; unsigned int real_num_tx_queues; struct Qdisc *qdisc; +#ifdef CONFIG_NET_SCHED + DECLARE_HASHTABLE (qdisc_hash, 4); +#endif unsigned long tx_queue_len; spinlock_t tx_global_lock; int watchdog_timeo; |