-diff -Naupr linux-4.8_orig/drivers/net/imq.c linux-4.8/drivers/net/imq.c
---- linux-4.8_orig/drivers/net/imq.c 1970-01-01 07:00:00.000000000 +0700
-+++ linux-4.8/drivers/net/imq.c 2016-10-03 07:59:56.140345020 +0700
-@@ -0,0 +1,904 @@
+diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
+index 95c32f2..93fada5 100644
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
+@@ -260,6 +260,125 @@ config RIONET_RX_SIZE
+ depends on RIONET
+ default "128"
+
++config IMQ
++ tristate "IMQ (intermediate queueing device) support"
++ depends on NETDEVICES && NETFILTER
++ ---help---
++ The IMQ device(s) is used as placeholder for QoS queueing
++ disciplines. Every packet entering/leaving the IP stack can be
++ directed through the IMQ device where it's enqueued/dequeued to the
++ attached qdisc. This allows you to treat network devices as classes
++ and distribute bandwidth among them. Iptables is used to specify
++ through which IMQ device, if any, packets travel.
++
++ More information at: https://github.com/imq/linuximq
++
++ To compile this driver as a module, choose M here: the module
++ will be called imq. If unsure, say N.
++
++choice
++ prompt "IMQ behavior (PRE/POSTROUTING)"
++ depends on IMQ
++ default IMQ_BEHAVIOR_AB
++ help
++ This setting defines how IMQ behaves in respect to its
++ hooking in PREROUTING and POSTROUTING.
++
++ IMQ can work in any of the following ways:
++
++ PREROUTING | POSTROUTING
++ -----------------|-------------------
++ #1 After NAT | After NAT
++ #2 After NAT | Before NAT
++ #3 Before NAT | After NAT
++ #4 Before NAT | Before NAT
++
++ The default behavior is to hook before NAT on PREROUTING
++ and after NAT on POSTROUTING (#3).
++
++ This settings are specially usefull when trying to use IMQ
++ to shape NATed clients.
++
++ More information can be found at: https://github.com/imq/linuximq
++
++ If not sure leave the default settings alone.
++
++config IMQ_BEHAVIOR_AA
++ bool "IMQ AA"
++ help
++ This setting defines how IMQ behaves in respect to its
++ hooking in PREROUTING and POSTROUTING.
++
++ Choosing this option will make IMQ hook like this:
++
++ PREROUTING: After NAT
++ POSTROUTING: After NAT
++
++ More information can be found at: https://github.com/imq/linuximq
++
++ If not sure leave the default settings alone.
++
++config IMQ_BEHAVIOR_AB
++ bool "IMQ AB"
++ help
++ This setting defines how IMQ behaves in respect to its
++ hooking in PREROUTING and POSTROUTING.
++
++ Choosing this option will make IMQ hook like this:
++
++ PREROUTING: After NAT
++ POSTROUTING: Before NAT
++
++ More information can be found at: https://github.com/imq/linuximq
++
++ If not sure leave the default settings alone.
++
++config IMQ_BEHAVIOR_BA
++ bool "IMQ BA"
++ help
++ This setting defines how IMQ behaves in respect to its
++ hooking in PREROUTING and POSTROUTING.
++
++ Choosing this option will make IMQ hook like this:
++
++ PREROUTING: Before NAT
++ POSTROUTING: After NAT
++
++ More information can be found at: https://github.com/imq/linuximq
++
++ If not sure leave the default settings alone.
++
++config IMQ_BEHAVIOR_BB
++ bool "IMQ BB"
++ help
++ This setting defines how IMQ behaves in respect to its
++ hooking in PREROUTING and POSTROUTING.
++
++ Choosing this option will make IMQ hook like this:
++
++ PREROUTING: Before NAT
++ POSTROUTING: Before NAT
++
++ More information can be found at: https://github.com/imq/linuximq
++
++ If not sure leave the default settings alone.
++
++endchoice
++
++config IMQ_NUM_DEVS
++ int "Number of IMQ devices"
++ range 2 16
++ depends on IMQ
++ default "16"
++ help
++ This setting defines how many IMQ devices will be created.
++
++ The default value is 16.
++
++ More information can be found at: https://github.com/imq/linuximq
++
++ If not sure leave the default settings alone.
++
+ config TUN
+ tristate "Universal TUN/TAP device driver support"
+ depends on INET
+diff --git a/drivers/net/Makefile b/drivers/net/Makefile
+index 7336cbd..d6d7ad4 100644
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
+@@ -11,6 +11,7 @@ obj-$(CONFIG_DUMMY) += dummy.o
+ obj-$(CONFIG_EQUALIZER) += eql.o
+ obj-$(CONFIG_IFB) += ifb.o
+ obj-$(CONFIG_MACSEC) += macsec.o
++obj-$(CONFIG_IMQ) += imq.o
+ obj-$(CONFIG_MACVLAN) += macvlan.o
+ obj-$(CONFIG_MACVTAP) += macvtap.o
+ obj-$(CONFIG_MII) += mii.o
+diff --git a/drivers/net/imq.c b/drivers/net/imq.c
+new file mode 100644
+index 0000000..bc3b997
+--- /dev/null
++++ b/drivers/net/imq.c
+@@ -0,0 +1,907 @@
+/*
+ * Pseudo-driver for the intermediate queue device.
+ *
+{
+ struct sk_buff *skb_orig, *skb, *skb_shared, *skb_popd;
+ struct Qdisc *q;
-+ struct sk_buff **to_free;
++ struct sk_buff *to_free = NULL;
+ struct netdev_queue *txq;
+ spinlock_t *root_lock;
+ int users;
+
+ /* backup skb->cb, as qdisc layer will overwrite it */
+ skb_save_cb(skb_shared);
-+ qdisc_enqueue_root(skb_shared, q, to_free); /* might kfree_skb */
++ qdisc_enqueue_root(skb_shared, q, &to_free); /* might kfree_skb */
+ if (likely(atomic_read(&skb_shared->users) == users + 1)) {
+ bool validate;
+
+ /* Note that we validate skb (GSO, checksum, ...) outside of locks */
+ if (validate)
+ skb_popd = validate_xmit_skb_list(skb_popd, dev);
-+
++
+ if (skb_popd) {
+ int dummy_ret;
+ int cpu = smp_processor_id(); /* ok because BHs are off */
+
+ txq = skb_get_tx_queue(dev, skb_popd);
-+ /*
++ /*
+ IMQ device will not be frozen or stoped, and it always be successful.
+ So we need not check its status and return value to accelerate.
+ */
+ }
+ retval = -1;
+out:
++ if (unlikely(to_free)) {
++ kfree_skb_list(to_free);
++ }
+ return retval;
+}
+static unsigned int imq_nf_hook(void *priv,
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See https://github.com/imq/linuximq/wiki for more information.");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_RTNL_LINK("imq");
-diff -Naupr linux-4.8_orig/drivers/net/Kconfig linux-4.8/drivers/net/Kconfig
---- linux-4.8_orig/drivers/net/Kconfig 2016-10-03 06:24:33.000000000 +0700
-+++ linux-4.8/drivers/net/Kconfig 2016-10-03 07:59:56.140345020 +0700
-@@ -258,6 +258,125 @@ config RIONET_RX_SIZE
- depends on RIONET
- default "128"
-
-+config IMQ
-+ tristate "IMQ (intermediate queueing device) support"
-+ depends on NETDEVICES && NETFILTER
-+ ---help---
-+ The IMQ device(s) is used as placeholder for QoS queueing
-+ disciplines. Every packet entering/leaving the IP stack can be
-+ directed through the IMQ device where it's enqueued/dequeued to the
-+ attached qdisc. This allows you to treat network devices as classes
-+ and distribute bandwidth among them. Iptables is used to specify
-+ through which IMQ device, if any, packets travel.
-+
-+ More information at: https://github.com/imq/linuximq
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called imq. If unsure, say N.
-+
-+choice
-+ prompt "IMQ behavior (PRE/POSTROUTING)"
-+ depends on IMQ
-+ default IMQ_BEHAVIOR_AB
-+ help
-+ This setting defines how IMQ behaves in respect to its
-+ hooking in PREROUTING and POSTROUTING.
-+
-+ IMQ can work in any of the following ways:
-+
-+ PREROUTING | POSTROUTING
-+ -----------------|-------------------
-+ #1 After NAT | After NAT
-+ #2 After NAT | Before NAT
-+ #3 Before NAT | After NAT
-+ #4 Before NAT | Before NAT
-+
-+ The default behavior is to hook before NAT on PREROUTING
-+ and after NAT on POSTROUTING (#3).
-+
-+ This settings are specially usefull when trying to use IMQ
-+ to shape NATed clients.
-+
-+ More information can be found at: https://github.com/imq/linuximq
-+
-+ If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_AA
-+ bool "IMQ AA"
-+ help
-+ This setting defines how IMQ behaves in respect to its
-+ hooking in PREROUTING and POSTROUTING.
-+
-+ Choosing this option will make IMQ hook like this:
-+
-+ PREROUTING: After NAT
-+ POSTROUTING: After NAT
-+
-+ More information can be found at: https://github.com/imq/linuximq
-+
-+ If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_AB
-+ bool "IMQ AB"
-+ help
-+ This setting defines how IMQ behaves in respect to its
-+ hooking in PREROUTING and POSTROUTING.
-+
-+ Choosing this option will make IMQ hook like this:
-+
-+ PREROUTING: After NAT
-+ POSTROUTING: Before NAT
-+
-+ More information can be found at: https://github.com/imq/linuximq
-+
-+ If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_BA
-+ bool "IMQ BA"
-+ help
-+ This setting defines how IMQ behaves in respect to its
-+ hooking in PREROUTING and POSTROUTING.
-+
-+ Choosing this option will make IMQ hook like this:
-+
-+ PREROUTING: Before NAT
-+ POSTROUTING: After NAT
-+
-+ More information can be found at: https://github.com/imq/linuximq
-+
-+ If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_BB
-+ bool "IMQ BB"
-+ help
-+ This setting defines how IMQ behaves in respect to its
-+ hooking in PREROUTING and POSTROUTING.
-+
-+ Choosing this option will make IMQ hook like this:
-+
-+ PREROUTING: Before NAT
-+ POSTROUTING: Before NAT
-+
-+ More information can be found at: https://github.com/imq/linuximq
-+
-+ If not sure leave the default settings alone.
-+
-+endchoice
-+
-+config IMQ_NUM_DEVS
-+ int "Number of IMQ devices"
-+ range 2 16
-+ depends on IMQ
-+ default "16"
-+ help
-+ This setting defines how many IMQ devices will be created.
-+
-+ The default value is 16.
-+
-+ More information can be found at: https://github.com/imq/linuximq
-+
-+ If not sure leave the default settings alone.
-+
- config TUN
- tristate "Universal TUN/TAP device driver support"
- depends on INET
-diff -Naupr linux-4.8_orig/drivers/net/Makefile linux-4.8/drivers/net/Makefile
---- linux-4.8_orig/drivers/net/Makefile 2016-10-03 06:24:33.000000000 +0700
-+++ linux-4.8/drivers/net/Makefile 2016-10-03 07:59:56.200344939 +0700
-@@ -11,6 +11,7 @@ obj-$(CONFIG_DUMMY) += dummy.o
- obj-$(CONFIG_EQUALIZER) += eql.o
- obj-$(CONFIG_IFB) += ifb.o
- obj-$(CONFIG_MACSEC) += macsec.o
-+obj-$(CONFIG_IMQ) += imq.o
- obj-$(CONFIG_MACVLAN) += macvlan.o
- obj-$(CONFIG_MACVTAP) += macvtap.o
- obj-$(CONFIG_MII) += mii.o
-diff -Naupr linux-4.8_orig/include/linux/imq.h linux-4.8/include/linux/imq.h
---- linux-4.8_orig/include/linux/imq.h 1970-01-01 07:00:00.000000000 +0700
-+++ linux-4.8/include/linux/imq.h 2016-10-03 07:59:56.200344939 +0700
+diff --git a/include/linux/imq.h b/include/linux/imq.h
+new file mode 100644
+index 0000000..1babb09
+--- /dev/null
++++ b/include/linux/imq.h
@@ -0,0 +1,13 @@
+#ifndef _IMQ_H
+#define _IMQ_H
+
+#endif /* _IMQ_H */
+
-diff -Naupr linux-4.8_orig/include/linux/netdevice.h linux-4.8/include/linux/netdevice.h
---- linux-4.8_orig/include/linux/netdevice.h 2016-10-03 06:24:33.000000000 +0700
-+++ linux-4.8/include/linux/netdevice.h 2016-10-03 07:59:56.200344939 +0700
-@@ -3602,6 +3602,19 @@ static inline void netif_tx_unlock_bh(st
+diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
+index e16a2a9..4a1090a 100644
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -3669,6 +3669,19 @@ static inline void netif_tx_unlock_bh(struct net_device *dev)
} \
}
static inline void netif_tx_disable(struct net_device *dev)
{
unsigned int i;
-diff -Naupr linux-4.8_orig/include/linux/netfilter/xt_IMQ.h linux-4.8/include/linux/netfilter/xt_IMQ.h
---- linux-4.8_orig/include/linux/netfilter/xt_IMQ.h 1970-01-01 07:00:00.000000000 +0700
-+++ linux-4.8/include/linux/netfilter/xt_IMQ.h 2016-10-03 07:59:56.200344939 +0700
+diff --git a/include/linux/netfilter/xt_IMQ.h b/include/linux/netfilter/xt_IMQ.h
+new file mode 100644
+index 0000000..9b07230
+--- /dev/null
++++ b/include/linux/netfilter/xt_IMQ.h
@@ -0,0 +1,9 @@
+#ifndef _XT_IMQ_H
+#define _XT_IMQ_H
+
+#endif /* _XT_IMQ_H */
+
-diff -Naupr linux-4.8_orig/include/linux/netfilter_ipv4/ipt_IMQ.h linux-4.8/include/linux/netfilter_ipv4/ipt_IMQ.h
---- linux-4.8_orig/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01 07:00:00.000000000 +0700
-+++ linux-4.8/include/linux/netfilter_ipv4/ipt_IMQ.h 2016-10-03 07:59:56.200344939 +0700
+diff --git a/include/linux/netfilter_ipv4/ipt_IMQ.h b/include/linux/netfilter_ipv4/ipt_IMQ.h
+new file mode 100644
+index 0000000..7af320f
+--- /dev/null
++++ b/include/linux/netfilter_ipv4/ipt_IMQ.h
@@ -0,0 +1,10 @@
+#ifndef _IPT_IMQ_H
+#define _IPT_IMQ_H
+
+#endif /* _IPT_IMQ_H */
+
-diff -Naupr linux-4.8_orig/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-4.8/include/linux/netfilter_ipv6/ip6t_IMQ.h
---- linux-4.8_orig/include/linux/netfilter_ipv6/ip6t_IMQ.h 1970-01-01 07:00:00.000000000 +0700
-+++ linux-4.8/include/linux/netfilter_ipv6/ip6t_IMQ.h 2016-10-03 07:59:56.200344939 +0700
+diff --git a/include/linux/netfilter_ipv6/ip6t_IMQ.h b/include/linux/netfilter_ipv6/ip6t_IMQ.h
+new file mode 100644
+index 0000000..198ac01
+--- /dev/null
++++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h
@@ -0,0 +1,10 @@
+#ifndef _IP6T_IMQ_H
+#define _IP6T_IMQ_H
+
+#endif /* _IP6T_IMQ_H */
+
-diff -Naupr linux-4.8_orig/include/linux/skbuff.h linux-4.8/include/linux/skbuff.h
---- linux-4.8_orig/include/linux/skbuff.h 2016-10-03 06:24:33.000000000 +0700
-+++ linux-4.8/include/linux/skbuff.h 2016-10-03 07:59:56.200344939 +0700
+diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
+index 32810f2..4ce1d0a 100644
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
@@ -39,6 +39,10 @@
#include <linux/in6.h>
#include <linux/if_packet.h>
/* The interface for checksum offload between the stack and networking drivers
* is as follows...
-@@ -655,6 +659,9 @@ struct sk_buff {
+@@ -654,6 +658,9 @@ struct sk_buff {
* first. This is owned by whoever has the skb queued ATM.
*/
char cb[48] __aligned(8);
unsigned long _skb_refdst;
void (*destructor)(struct sk_buff *skb);
-@@ -664,6 +671,9 @@ struct sk_buff {
+@@ -663,6 +670,9 @@ struct sk_buff {
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
struct nf_conntrack *nfct;
#endif
#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
struct nf_bridge_info *nf_bridge;
#endif
-@@ -731,6 +741,9 @@ struct sk_buff {
- __u8 inner_protocol_type:1;
- __u8 remcsum_offload:1;
- /* 3 or 5 bit hole */
-+ #if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+ __u8 imq_flags:IMQ_F_BITS;
-+ #endif
+@@ -743,6 +753,9 @@ struct sk_buff {
+ __u8 offload_fwd_mark:1;
+ #endif
+ /* 2, 4 or 5 bit hole */
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++ __u8 imq_flags:IMQ_F_BITS;
++#endif
#ifdef CONFIG_NET_SCHED
__u16 tc_index; /* traffic control index */
-@@ -896,6 +909,12 @@ void kfree_skb_list(struct sk_buff *segs
+@@ -903,6 +916,12 @@ void kfree_skb_list(struct sk_buff *segs);
void skb_tx_error(struct sk_buff *skb);
void consume_skb(struct sk_buff *skb);
void __kfree_skb(struct sk_buff *skb);
extern struct kmem_cache *skbuff_head_cache;
void kfree_skb_partial(struct sk_buff *skb, bool head_stolen);
-@@ -3555,6 +3574,10 @@ static inline void __nf_copy(struct sk_b
+@@ -3594,6 +3613,10 @@ static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src,
if (copy)
dst->nfctinfo = src->nfctinfo;
#endif
#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
dst->nf_bridge = src->nf_bridge;
nf_bridge_get(src->nf_bridge);
-diff -Naupr linux-4.8_orig/include/net/netfilter/nf_queue.h linux-4.8/include/net/netfilter/nf_queue.h
---- linux-4.8_orig/include/net/netfilter/nf_queue.h 2016-10-03 06:24:33.000000000 +0700
-+++ linux-4.8/include/net/netfilter/nf_queue.h 2016-10-03 07:59:56.200344939 +0700
-@@ -31,6 +31,12 @@ struct nf_queue_handler {
+diff --git a/include/net/netfilter/nf_queue.h b/include/net/netfilter/nf_queue.h
+index 2280cfe..ec8fa51 100644
+--- a/include/net/netfilter/nf_queue.h
++++ b/include/net/netfilter/nf_queue.h
+@@ -30,6 +30,12 @@ struct nf_queue_handler {
void nf_register_queue_handler(struct net *net, const struct nf_queue_handler *qh);
void nf_unregister_queue_handler(struct net *net);
void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);
void nf_queue_entry_get_refs(struct nf_queue_entry *entry);
void nf_queue_entry_release_refs(struct nf_queue_entry *entry);
-diff -Naupr linux-4.8_orig/include/net/pkt_sched.h linux-4.8/include/net/pkt_sched.h
---- linux-4.8_orig/include/net/pkt_sched.h 2016-10-03 06:24:33.000000000 +0700
-+++ linux-4.8/include/net/pkt_sched.h 2016-10-03 07:59:56.200344939 +0700
-@@ -105,6 +105,8 @@ int sch_direct_xmit(struct sk_buff *skb,
+diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
+index cd334c9..6757228 100644
+--- a/include/net/pkt_sched.h
++++ b/include/net/pkt_sched.h
+@@ -105,6 +105,8 @@ int sch_direct_xmit(struct sk_buff *skb, struct Qdisc *q,
void __qdisc_run(struct Qdisc *q);
static inline void qdisc_run(struct Qdisc *q)
{
if (qdisc_run_begin(q))
-diff -Naupr linux-4.8_orig/include/net/sch_generic.h linux-4.8/include/net/sch_generic.h
---- linux-4.8_orig/include/net/sch_generic.h 2016-10-03 06:24:33.000000000 +0700
-+++ linux-4.8/include/net/sch_generic.h 2016-10-03 07:59:56.200344939 +0700
-@@ -510,6 +510,13 @@ static inline int qdisc_enqueue(struct s
+diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
+index e6aa0a2..08b37dc 100644
+--- a/include/net/sch_generic.h
++++ b/include/net/sch_generic.h
+@@ -518,6 +518,13 @@ static inline int qdisc_enqueue(struct sk_buff *skb, struct Qdisc *sch,
return sch->enqueue(skb, sch, to_free);
}
static inline bool qdisc_is_percpu_stats(const struct Qdisc *q)
{
return q->flags & TCQ_F_CPUSTATS;
-diff -Naupr linux-4.8_orig/include/uapi/linux/netfilter.h linux-4.8/include/uapi/linux/netfilter.h
---- linux-4.8_orig/include/uapi/linux/netfilter.h 2016-10-03 06:24:33.000000000 +0700
-+++ linux-4.8/include/uapi/linux/netfilter.h 2016-10-03 07:59:56.203678268 +0700
+diff --git a/include/uapi/linux/netfilter.h b/include/uapi/linux/netfilter.h
+index d93f949..23fb6d1 100644
+--- a/include/uapi/linux/netfilter.h
++++ b/include/uapi/linux/netfilter.h
@@ -14,7 +14,8 @@
#define NF_QUEUE 3
#define NF_REPEAT 4
/* we overload the higher bits for encoding auxiliary data such as the queue
* number or errno values. Not nice, but better than additional function
-diff -Naupr linux-4.8_orig/net/core/dev.c linux-4.8/net/core/dev.c
---- linux-4.8_orig/net/core/dev.c 2016-10-03 06:24:33.000000000 +0700
-+++ linux-4.8/net/core/dev.c 2016-10-03 07:59:56.203678268 +0700
+diff --git a/net/core/dev.c b/net/core/dev.c
+index 6666b28..3e12add 100644
+--- a/net/core/dev.c
++++ b/net/core/dev.c
@@ -141,6 +141,9 @@
#include <linux/netfilter_ingress.h>
#include <linux/sctp.h>
#include "net-sysfs.h"
-@@ -2952,6 +2952,9 @@
- *ret = rc;
+@@ -2906,7 +2909,12 @@ static int xmit_one(struct sk_buff *skb, struct net_device *dev,
+ unsigned int len;
+ int rc;
+
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++ if ((!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) &&
++ !(skb->imq_flags & IMQ_F_ENQUEUE))
++#else
+ if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all))
++#endif
+ dev_queue_xmit_nit(skb, dev);
+
+ len = skb->len;
+@@ -2945,6 +2953,8 @@ struct sk_buff *dev_hard_start_xmit(struct sk_buff *first, struct net_device *de
return skb;
}
-+#if defined(CONFIG_IMQ_MODULE)
-+EXPORT_SYMBOL_GPL(dev_hard_start_xmit);
-+#endif
++EXPORT_SYMBOL_GPL(dev_hard_start_xmit);
++
static struct sk_buff *validate_xmit_vlan(struct sk_buff *skb,
netdev_features_t features)
-diff -Naupr linux-4.8_orig/net/core/skbuff.c linux-4.8/net/core/skbuff.c
---- linux-4.8_orig/net/core/skbuff.c 2016-10-03 06:24:33.000000000 +0700
-+++ linux-4.8/net/core/skbuff.c 2016-10-03 07:59:56.203678268 +0700
-@@ -82,6 +82,87 @@ struct kmem_cache *skbuff_head_cache __r
+ {
+diff --git a/net/core/skbuff.c b/net/core/skbuff.c
+index 1e3e008..379236e 100644
+--- a/net/core/skbuff.c
++++ b/net/core/skbuff.c
+@@ -82,6 +82,87 @@ struct kmem_cache *skbuff_head_cache __read_mostly;
static struct kmem_cache *skbuff_fclone_cache __read_mostly;
int sysctl_max_skb_frags __read_mostly = MAX_SKB_FRAGS;
EXPORT_SYMBOL(sysctl_max_skb_frags);
/**
* skb_panic - private function for out-of-line support
-@@ -654,6 +735,28 @@ static void skb_release_head_state(struc
+@@ -654,6 +735,28 @@ static void skb_release_head_state(struct sk_buff *skb)
WARN_ON(in_irq());
skb->destructor(skb);
}
#if IS_ENABLED(CONFIG_NF_CONNTRACK)
nf_conntrack_put(skb->nfct);
#endif
-@@ -843,6 +946,10 @@ static void __copy_skb_header(struct sk_
+@@ -843,6 +946,10 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old)
new->sp = secpath_get(old->sp);
#endif
__nf_copy(new, old, false);
/* Note : this field could be in headers_start/headers_end section
* It is not yet because we do not want to have a 16 bit hole
-@@ -3439,6 +3546,13 @@ void __init skb_init(void)
+@@ -3463,6 +3570,13 @@ void __init skb_init(void)
0,
SLAB_HWCACHE_ALIGN|SLAB_PANIC,
NULL);
}
/**
-diff -Naupr linux-4.8_orig/net/ipv6/ip6_output.c linux-4.8/net/ipv6/ip6_output.c
---- linux-4.8_orig/net/ipv6/ip6_output.c 2016-10-03 06:24:33.000000000 +0700
-+++ linux-4.8/net/ipv6/ip6_output.c 2016-10-03 07:59:56.203678268 +0700
-@@ -65,9 +65,6 @@ static int ip6_finish_output2(struct net
+diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
+index 59eb4ed..8020b07 100644
+--- a/net/ipv6/ip6_output.c
++++ b/net/ipv6/ip6_output.c
+@@ -66,9 +66,6 @@ static int ip6_finish_output2(struct net *net, struct sock *sk, struct sk_buff *
struct in6_addr *nexthop;
int ret;
if (ipv6_addr_is_multicast(&ipv6_hdr(skb)->daddr)) {
struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb));
-@@ -142,6 +139,13 @@ int ip6_output(struct net *net, struct s
+@@ -150,6 +147,13 @@ int ip6_output(struct net *net, struct sock *sk, struct sk_buff *skb)
return 0;
}
return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING,
net, sk, skb, NULL, dev,
ip6_finish_output,
-diff -Naupr linux-4.8_orig/net/netfilter/core.c linux-4.8/net/netfilter/core.c
---- linux-4.8_orig/net/netfilter/core.c 2016-10-03 06:24:33.000000000 +0700
-+++ linux-4.8/net/netfilter/core.c 2016-10-03 07:59:56.203678268 +0700
-@@ -311,10 +311,14 @@ next_hook:
- ret = NF_DROP_GETERR(verdict);
- if (ret == 0)
- ret = -EPERM;
-- } else if ((verdict & NF_VERDICT_MASK) == NF_QUEUE) {
-+ } else if ((verdict & NF_VERDICT_MASK) == NF_QUEUE ||
-+ (verdict & NF_VERDICT_MASK) == NF_IMQ_QUEUE) {
- int err = nf_queue(skb, elem, state,
-- verdict >> NF_VERDICT_QBITS);
-+ verdict >> NF_VERDICT_QBITS,
-+ verdict & NF_VERDICT_MASK);
- if (err < 0) {
-+ if (err == -ECANCELED)
-+ goto next_hook;
- if (err == -ESRCH &&
- (verdict & NF_VERDICT_FLAG_QUEUE_BYPASS))
- goto next_hook;
-diff -Naupr linux-4.8_orig/net/netfilter/Kconfig linux-4.8/net/netfilter/Kconfig
---- linux-4.8_orig/net/netfilter/Kconfig 2016-10-03 06:24:33.000000000 +0700
-+++ linux-4.8/net/netfilter/Kconfig 2016-10-03 07:59:56.203678268 +0700
-@@ -805,6 +805,18 @@ config NETFILTER_XT_TARGET_LOG
+diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
+index e8d56d9..1ed3468 100644
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -823,6 +823,18 @@ config NETFILTER_XT_TARGET_LOG
To compile it as a module, choose M here. If unsure, say N.
config NETFILTER_XT_TARGET_MARK
tristate '"MARK" target support'
depends on NETFILTER_ADVANCED
-diff -Naupr linux-4.8_orig/net/netfilter/Makefile linux-4.8/net/netfilter/Makefile
---- linux-4.8_orig/net/netfilter/Makefile 2016-10-03 06:24:33.000000000 +0700
-+++ linux-4.8/net/netfilter/Makefile 2016-10-03 07:59:56.203678268 +0700
-@@ -115,6 +115,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CT) +=
+diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
+index c23c3c8..99911ef 100644
+--- a/net/netfilter/Makefile
++++ b/net/netfilter/Makefile
+@@ -119,6 +119,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CT) += xt_CT.o
obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o
obj-$(CONFIG_NETFILTER_XT_TARGET_HMARK) += xt_HMARK.o
obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o
obj-$(CONFIG_NETFILTER_XT_TARGET_LOG) += xt_LOG.o
obj-$(CONFIG_NETFILTER_XT_TARGET_NETMAP) += xt_NETMAP.o
-diff -Naupr linux-4.8_orig/net/netfilter/nf_internals.h linux-4.8/net/netfilter/nf_internals.h
---- linux-4.8_orig/net/netfilter/nf_internals.h 2016-10-03 06:24:33.000000000 +0700
-+++ linux-4.8/net/netfilter/nf_internals.h 2016-10-03 07:59:56.203678268 +0700
-@@ -18,7 +18,7 @@ unsigned int nf_iterate(struct list_head
-
- /* nf_queue.c */
- int nf_queue(struct sk_buff *skb, struct nf_hook_ops *elem,
-- struct nf_hook_state *state, unsigned int queuenum);
-+ struct nf_hook_state *state, unsigned int queuenum, unsigned int queuetype);
- void nf_queue_nf_hook_drop(struct net *net, struct nf_hook_ops *ops);
- int __init netfilter_queue_init(void);
-
-diff -Naupr linux-4.8_orig/net/netfilter/nf_queue.c linux-4.8/net/netfilter/nf_queue.c
---- linux-4.8_orig/net/netfilter/nf_queue.c 2016-10-03 06:24:33.000000000 +0700
-+++ linux-4.8/net/netfilter/nf_queue.c 2016-10-03 07:59:56.203678268 +0700
+diff --git a/net/netfilter/core.c b/net/netfilter/core.c
+index 004af03..768a08b 100644
+--- a/net/netfilter/core.c
++++ b/net/netfilter/core.c
+@@ -360,8 +360,11 @@ int nf_hook_slow(struct sk_buff *skb, struct nf_hook_state *state)
+ ret = NF_DROP_GETERR(verdict);
+ if (ret == 0)
+ ret = -EPERM;
+- } else if ((verdict & NF_VERDICT_MASK) == NF_QUEUE) {
++ } else if ((verdict & NF_VERDICT_MASK) == NF_QUEUE ||
++ (verdict & NF_VERDICT_MASK) == NF_IMQ_QUEUE) {
+ ret = nf_queue(skb, state, &entry, verdict);
++ if (ret == -ECANCELED)
++ goto next_hook;
+ if (ret == 1 && entry)
+ goto next_hook;
+ }
+diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
+index 8f08d75..8d362c0 100644
+--- a/net/netfilter/nf_queue.c
++++ b/net/netfilter/nf_queue.c
@@ -27,6 +27,23 @@
* receives, no matter what.
*/
/* return EBUSY when somebody else is registered, return EEXIST if the
* same handler is registered, return 0 in case of success. */
void nf_register_queue_handler(struct net *net, const struct nf_queue_handler *qh)
-@@ -114,7 +131,8 @@ void nf_queue_nf_hook_drop(struct net *n
- int nf_queue(struct sk_buff *skb,
- struct nf_hook_ops *elem,
- struct nf_hook_state *state,
-- unsigned int queuenum)
-+ unsigned int queuenum,
-+ unsigned int queuetype)
+@@ -108,16 +125,28 @@ void nf_queue_nf_hook_drop(struct net *net, const struct nf_hook_entry *entry)
+ }
+
+ static int __nf_queue(struct sk_buff *skb, const struct nf_hook_state *state,
+- unsigned int queuenum)
++ unsigned int verdict)
{
int status = -ENOENT;
struct nf_queue_entry *entry = NULL;
-@@ -123,7 +141,17 @@ int nf_queue(struct sk_buff *skb,
+ const struct nf_afinfo *afinfo;
+ const struct nf_queue_handler *qh;
struct net *net = state->net;
++ unsigned int queuetype = verdict & NF_VERDICT_MASK;
++ unsigned int queuenum = verdict >> NF_VERDICT_QBITS;
/* QUEUE == DROP if no one is waiting, to be safe. */
- qh = rcu_dereference(net->nf.queue_handler);
if (!qh) {
status = -ESRCH;
goto err;
-@@ -198,8 +226,10 @@ void nf_reinject(struct nf_queue_entry *
+@@ -218,6 +247,7 @@ void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
local_bh_enable();
break;
case NF_QUEUE:
+ case NF_IMQ_QUEUE:
- err = nf_queue(skb, elem, &entry->state,
-- verdict >> NF_VERDICT_QBITS);
-+ verdict >> NF_VERDICT_QBITS,
-+ verdict & NF_VERDICT_MASK);
- if (err < 0) {
- if (err == -ESRCH &&
- (verdict & NF_VERDICT_FLAG_QUEUE_BYPASS))
-diff -Naupr linux-4.8_orig/net/netfilter/xt_IMQ.c linux-4.8/net/netfilter/xt_IMQ.c
---- linux-4.8_orig/net/netfilter/xt_IMQ.c 1970-01-01 07:00:00.000000000 +0700
-+++ linux-4.8/net/netfilter/xt_IMQ.c 2016-10-03 07:59:56.203678268 +0700
+ err = nf_queue(skb, &entry->state, &hook_entry, verdict);
+ if (err == 1) {
+ if (hook_entry)
+diff --git a/net/netfilter/xt_IMQ.c b/net/netfilter/xt_IMQ.c
+new file mode 100644
+index 0000000..f9c5817
+--- /dev/null
++++ b/net/netfilter/xt_IMQ.c
@@ -0,0 +1,72 @@
+/*
+ * This target marks packets to be enqueued to an imq device
+MODULE_ALIAS("ipt_IMQ");
+MODULE_ALIAS("ip6t_IMQ");
+
-diff -Naupr linux-4.8_orig/net/sched/sch_generic.c linux-4.8/net/sched/sch_generic.c
---- linux-4.8_orig/net/sched/sch_generic.c 2016-10-03 06:24:33.000000000 +0700
-+++ linux-4.8/net/sched/sch_generic.c 2016-10-03 07:59:56.207011597 +0700
-@@ -154,6 +154,14 @@ bulk:
+diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
+index 6cfb6e9..4c675e9 100644
+--- a/net/sched/sch_generic.c
++++ b/net/sched/sch_generic.c
+@@ -154,6 +154,14 @@ static struct sk_buff *dequeue_skb(struct Qdisc *q, bool *validate,
return skb;
}
projects / packages / kernel.git / commitdiff