diff options
| author | David S. Miller | 2017-10-30 06:10:01 +0100 |
|---|---|---|
| committer | David S. Miller | 2017-10-30 13:09:24 +0100 |
| commit | e1ea2f9856b765a2eaabb403a6751f70efc9ba4c (patch) | |
| tree | 771f0f96fdab1b27757730e96d911c73f5499ee4 /include/net/sch_generic.h | |
| parent | Merge branch 'ipvlan-private-vepa' (diff) | |
| parent | Linux 4.14-rc7 (diff) | |
| download | kernel-qcow2-linux-e1ea2f9856b765a2eaabb403a6751f70efc9ba4c.tar.gz kernel-qcow2-linux-e1ea2f9856b765a2eaabb403a6751f70efc9ba4c.tar.xz kernel-qcow2-linux-e1ea2f9856b765a2eaabb403a6751f70efc9ba4c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Several conflicts here.
NFP driver bug fix adding nfp_netdev_is_nfp_repr() check to
nfp_fl_output() needed some adjustments because the code block is in
an else block now.
Parallel additions to net/pkt_cls.h and net/sch_generic.h
A bug fix in __tcp_retransmit_skb() conflicted with some of
the rbtree changes in net-next.
The tc action RCU callback fixes in 'net' had some overlap with some
of the recent tcf_block reworking.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/sch_generic.h')
| -rw-r--r-- | include/net/sch_generic.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 031dffd5836c..07c179dab478 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -10,6 +10,7 @@ #include <linux/dynamic_queue_limits.h> #include <linux/list.h> #include <linux/refcount.h> +#include <linux/workqueue.h> #include <net/gen_stats.h> #include <net/rtnetlink.h> @@ -273,6 +274,7 @@ struct tcf_block { struct net *net; struct Qdisc *q; struct list_head cb_list; + struct work_struct work; }; static inline void qdisc_cb_private_validate(const struct sk_buff *skb, int sz) |