]> git.pld-linux.org Git - packages/kernel.git/blobdiff - kernel-imq.patch
projects / packages / kernel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- 4.9.1
[packages/kernel.git] / kernel-imq.patch
diff --git a/kernel-imq.patch b/kernel-imq.patch
index b28cac4bc79f02f430894b0cad5ab9fddf071f5c..247a57a60056076d1fd00de2285737f574ed9f98 100644 (file)
--- a/kernel-imq.patch
+++ b/kernel-imq.patch
@@ -1,7 +1,7 @@
-diff -Naupr linux-4.7_orig/drivers/net/imq.c linux-4.7/drivers/net/imq.c
---- linux-4.7_orig/drivers/net/imq.c   1970-01-01 07:00:00.000000000 +0700
-+++ linux-4.7/drivers/net/imq.c        2016-07-26 20:58:55.635901659 +0700
-@@ -0,0 +1,903 @@
+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 @@
 +/*
 + *             Pseudo-driver for the intermediate queue device.
 + *
@@ -553,6 +553,7 @@ diff -Naupr linux-4.7_orig/drivers/net/imq.c linux-4.7/drivers/net/imq.c
 +{
 +      struct sk_buff *skb_orig, *skb, *skb_shared, *skb_popd;
 +      struct Qdisc *q;
++      struct sk_buff **to_free;
 +      struct netdev_queue *txq;
 +      spinlock_t *root_lock;
 +      int users;
@@ -611,7 +612,7 @@ diff -Naupr linux-4.7_orig/drivers/net/imq.c linux-4.7/drivers/net/imq.c
 +
 +      /* backup skb->cb, as qdisc layer will overwrite it */
 +      skb_save_cb(skb_shared);
-+      qdisc_enqueue_root(skb_shared, q); /* 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;
 +
@@ -901,13 +902,13 @@ diff -Naupr linux-4.7_orig/drivers/net/imq.c linux-4.7/drivers/net/imq.c
 +MODULE_PARM_DESC(numqueues, "number of queues per IMQ device");
 +MODULE_PARM_DESC(imq_dev_accurate_stats, "Notify if need the accurate imq device stats");
 +
-+MODULE_AUTHOR("http://https://github.com/imq/linuximq");
++MODULE_AUTHOR("https://github.com/imq/linuximq");
 +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.7_orig/drivers/net/Kconfig linux-4.7/drivers/net/Kconfig
---- linux-4.7_orig/drivers/net/Kconfig 2016-07-25 02:23:50.000000000 +0700
-+++ linux-4.7/drivers/net/Kconfig      2016-07-26 20:58:55.635901659 +0700
+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"
@@ -1034,9 +1035,9 @@ diff -Naupr linux-4.7_orig/drivers/net/Kconfig linux-4.7/drivers/net/Kconfig
  config TUN
        tristate "Universal TUN/TAP device driver support"
        depends on INET
-diff -Naupr linux-4.7_orig/drivers/net/Makefile linux-4.7/drivers/net/Makefile
---- linux-4.7_orig/drivers/net/Makefile        2016-07-25 02:23:50.000000000 +0700
-+++ linux-4.7/drivers/net/Makefile     2016-07-26 20:58:55.635901659 +0700
+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
@@ -1045,9 +1046,9 @@ diff -Naupr linux-4.7_orig/drivers/net/Makefile linux-4.7/drivers/net/Makefile
  obj-$(CONFIG_MACVLAN) += macvlan.o
  obj-$(CONFIG_MACVTAP) += macvtap.o
  obj-$(CONFIG_MII) += mii.o
-diff -Naupr linux-4.7_orig/include/linux/imq.h linux-4.7/include/linux/imq.h
---- linux-4.7_orig/include/linux/imq.h 1970-01-01 07:00:00.000000000 +0700
-+++ linux-4.7/include/linux/imq.h      2016-07-26 20:58:55.639235009 +0700
+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
 @@ -0,0 +1,13 @@
 +#ifndef _IMQ_H
 +#define _IMQ_H
@@ -1062,10 +1063,10 @@ diff -Naupr linux-4.7_orig/include/linux/imq.h linux-4.7/include/linux/imq.h
 +
 +#endif /* _IMQ_H */
 +
-diff -Naupr linux-4.7_orig/include/linux/netdevice.h linux-4.7/include/linux/netdevice.h
---- linux-4.7_orig/include/linux/netdevice.h   2016-07-25 02:23:50.000000000 +0700
-+++ linux-4.7/include/linux/netdevice.h        2016-07-26 20:58:55.639235009 +0700
-@@ -3558,6 +3558,19 @@ static inline void netif_tx_unlock_bh(st
+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
        }                                               \
  }
  
@@ -1085,9 +1086,9 @@ diff -Naupr linux-4.7_orig/include/linux/netdevice.h linux-4.7/include/linux/net
  static inline void netif_tx_disable(struct net_device *dev)
  {
        unsigned int i;
-diff -Naupr linux-4.7_orig/include/linux/netfilter/xt_IMQ.h linux-4.7/include/linux/netfilter/xt_IMQ.h
---- linux-4.7_orig/include/linux/netfilter/xt_IMQ.h    1970-01-01 07:00:00.000000000 +0700
-+++ linux-4.7/include/linux/netfilter/xt_IMQ.h 2016-07-26 20:58:55.639235009 +0700
+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
 @@ -0,0 +1,9 @@
 +#ifndef _XT_IMQ_H
 +#define _XT_IMQ_H
@@ -1098,9 +1099,9 @@ diff -Naupr linux-4.7_orig/include/linux/netfilter/xt_IMQ.h linux-4.7/include/li
 +
 +#endif /* _XT_IMQ_H */
 +
-diff -Naupr linux-4.7_orig/include/linux/netfilter_ipv4/ipt_IMQ.h linux-4.7/include/linux/netfilter_ipv4/ipt_IMQ.h
---- linux-4.7_orig/include/linux/netfilter_ipv4/ipt_IMQ.h      1970-01-01 07:00:00.000000000 +0700
-+++ linux-4.7/include/linux/netfilter_ipv4/ipt_IMQ.h   2016-07-26 20:58:55.639235009 +0700
+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
 @@ -0,0 +1,10 @@
 +#ifndef _IPT_IMQ_H
 +#define _IPT_IMQ_H
@@ -1112,9 +1113,9 @@ diff -Naupr linux-4.7_orig/include/linux/netfilter_ipv4/ipt_IMQ.h linux-4.7/incl
 +
 +#endif /* _IPT_IMQ_H */
 +
-diff -Naupr linux-4.7_orig/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-4.7/include/linux/netfilter_ipv6/ip6t_IMQ.h
---- linux-4.7_orig/include/linux/netfilter_ipv6/ip6t_IMQ.h     1970-01-01 07:00:00.000000000 +0700
-+++ linux-4.7/include/linux/netfilter_ipv6/ip6t_IMQ.h  2016-07-26 20:58:55.639235009 +0700
+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
 @@ -0,0 +1,10 @@
 +#ifndef _IP6T_IMQ_H
 +#define _IP6T_IMQ_H
@@ -1126,12 +1127,12 @@ diff -Naupr linux-4.7_orig/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-4.7/inc
 +
 +#endif /* _IP6T_IMQ_H */
 +
-diff -Naupr linux-4.7_orig/include/linux/skbuff.h linux-4.7/include/linux/skbuff.h
---- linux-4.7_orig/include/linux/skbuff.h      2016-07-25 02:23:50.000000000 +0700
-+++ linux-4.7/include/linux/skbuff.h   2016-07-26 20:58:55.639235009 +0700
-@@ -38,6 +38,10 @@
- #include <linux/splice.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
+@@ -39,6 +39,10 @@
  #include <linux/in6.h>
+ #include <linux/if_packet.h>
  #include <net/flow.h>
 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
 +#include <linux/imq.h>
@@ -1140,7 +1141,7 @@ diff -Naupr linux-4.7_orig/include/linux/skbuff.h linux-4.7/include/linux/skbuff
  
  /* The interface for checksum offload between the stack and networking drivers
   * is as follows...
-@@ -647,6 +651,9 @@ struct sk_buff {
+@@ -655,6 +659,9 @@ struct sk_buff {
         * first. This is owned by whoever has the skb queued ATM.
         */
        char                    cb[48] __aligned(8);
@@ -1150,7 +1151,7 @@ diff -Naupr linux-4.7_orig/include/linux/skbuff.h linux-4.7/include/linux/skbuff
  
        unsigned long           _skb_refdst;
        void                    (*destructor)(struct sk_buff *skb);
-@@ -656,6 +663,9 @@ struct sk_buff {
+@@ -664,6 +671,9 @@ struct sk_buff {
  #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
        struct nf_conntrack     *nfct;
  #endif
@@ -1160,7 +1161,7 @@ diff -Naupr linux-4.7_orig/include/linux/skbuff.h linux-4.7/include/linux/skbuff
  #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
        struct nf_bridge_info   *nf_bridge;
  #endif
-@@ -723,6 +733,9 @@ struct sk_buff {
+@@ -731,6 +741,9 @@ struct sk_buff {
        __u8                    inner_protocol_type:1;
        __u8                    remcsum_offload:1;
        /* 3 or 5 bit hole */
@@ -1170,7 +1171,7 @@ diff -Naupr linux-4.7_orig/include/linux/skbuff.h linux-4.7/include/linux/skbuff
  
  #ifdef CONFIG_NET_SCHED
        __u16                   tc_index;       /* traffic control index */
-@@ -879,6 +892,12 @@ void kfree_skb_list(struct sk_buff *segs
+@@ -896,6 +909,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);
@@ -1183,7 +1184,7 @@ diff -Naupr linux-4.7_orig/include/linux/skbuff.h linux-4.7/include/linux/skbuff
  extern struct kmem_cache *skbuff_head_cache;
  
  void kfree_skb_partial(struct sk_buff *skb, bool head_stolen);
-@@ -3523,6 +3542,10 @@ static inline void __nf_copy(struct sk_b
+@@ -3555,6 +3574,10 @@ static inline void __nf_copy(struct sk_b
        if (copy)
                dst->nfctinfo = src->nfctinfo;
  #endif
@@ -1194,9 +1195,9 @@ diff -Naupr linux-4.7_orig/include/linux/skbuff.h linux-4.7/include/linux/skbuff
  #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
        dst->nf_bridge  = src->nf_bridge;
        nf_bridge_get(src->nf_bridge);
-diff -Naupr linux-4.7_orig/include/net/netfilter/nf_queue.h linux-4.7/include/net/netfilter/nf_queue.h
---- linux-4.7_orig/include/net/netfilter/nf_queue.h    2016-07-25 02:23:50.000000000 +0700
-+++ linux-4.7/include/net/netfilter/nf_queue.h 2016-07-26 20:58:55.642568359 +0700
+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 {
  void nf_register_queue_handler(struct net *net, const struct nf_queue_handler *qh);
  void nf_unregister_queue_handler(struct net *net);
@@ -1210,9 +1211,9 @@ diff -Naupr linux-4.7_orig/include/net/netfilter/nf_queue.h linux-4.7/include/ne
  
  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.7_orig/include/net/pkt_sched.h linux-4.7/include/net/pkt_sched.h
---- linux-4.7_orig/include/net/pkt_sched.h     2016-07-25 02:23:50.000000000 +0700
-+++ linux-4.7/include/net/pkt_sched.h  2016-07-26 20:58:55.642568359 +0700
+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,
  
  void __qdisc_run(struct Qdisc *q);
@@ -1222,25 +1223,26 @@ diff -Naupr linux-4.7_orig/include/net/pkt_sched.h linux-4.7/include/net/pkt_sch
  static inline void qdisc_run(struct Qdisc *q)
  {
        if (qdisc_run_begin(q))
-diff -Naupr linux-4.7_orig/include/net/sch_generic.h linux-4.7/include/net/sch_generic.h
---- linux-4.7_orig/include/net/sch_generic.h   2016-07-25 02:23:50.000000000 +0700
-+++ linux-4.7/include/net/sch_generic.h        2016-07-26 20:58:55.642568359 +0700
-@@ -523,6 +523,12 @@ static inline int qdisc_enqueue(struct s
-       return sch->enqueue(skb, sch);
+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
+       return sch->enqueue(skb, sch, to_free);
  }
  
-+static inline int qdisc_enqueue_root(struct sk_buff *skb, struct Qdisc *sch)
++static inline int qdisc_enqueue_root(struct sk_buff *skb, struct Qdisc *sch,
++                                    struct sk_buff **to_free)
 +{
 +    qdisc_skb_cb(skb)->pkt_len = skb->len;
-+    return qdisc_enqueue(skb, sch) & NET_XMIT_MASK;
++    return qdisc_enqueue(skb, sch, to_free) & NET_XMIT_MASK;
 +}
 +
  static inline bool qdisc_is_percpu_stats(const struct Qdisc *q)
  {
        return q->flags & TCQ_F_CPUSTATS;
-diff -Naupr linux-4.7_orig/include/uapi/linux/netfilter.h linux-4.7/include/uapi/linux/netfilter.h
---- linux-4.7_orig/include/uapi/linux/netfilter.h      2016-07-25 02:23:50.000000000 +0700
-+++ linux-4.7/include/uapi/linux/netfilter.h   2016-07-26 20:58:55.642568359 +0700
+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
 @@ -14,7 +14,8 @@
  #define NF_QUEUE 3
  #define NF_REPEAT 4
@@ -1251,52 +1253,33 @@ diff -Naupr linux-4.7_orig/include/uapi/linux/netfilter.h linux-4.7/include/uapi
  
  /* 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.7_orig/net/core/dev.c linux-4.7/net/core/dev.c
---- linux-4.7_orig/net/core/dev.c      2016-07-25 02:23:50.000000000 +0700
-+++ linux-4.7/net/core/dev.c   2016-07-26 20:58:55.642568359 +0700
-@@ -139,6 +139,9 @@
- #include <linux/hrtimer.h>
+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
+@@ -141,6 +141,9 @@
  #include <linux/netfilter_ingress.h>
  #include <linux/sctp.h>
+ #include <linux/crash_dump.h>
 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
 +#include <linux/imq.h>
 +#endif
  
  #include "net-sysfs.h"
  
-@@ -2908,7 +2911,12 @@ static int xmit_one(struct sk_buff *skb,
-       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;
-@@ -2946,6 +2954,7 @@ out:
+@@ -2952,6 +2952,9 @@
        *ret = rc;
        return skb;
  }
-+EXPORT_SYMBOL(dev_hard_start_xmit);
++#if defined(CONFIG_IMQ_MODULE)
++EXPORT_SYMBOL_GPL(dev_hard_start_xmit);
++#endif
  
  static struct sk_buff *validate_xmit_vlan(struct sk_buff *skb,
                                          netdev_features_t features)
-@@ -3032,6 +3041,7 @@ struct sk_buff *validate_xmit_skb_list(s
-       }
-       return head;
- }
-+EXPORT_SYMBOL(validate_xmit_skb_list);
- 
- static void qdisc_pkt_len_init(struct sk_buff *skb)
- {
-diff -Naupr linux-4.7_orig/net/core/skbuff.c linux-4.7/net/core/skbuff.c
---- linux-4.7_orig/net/core/skbuff.c   2016-07-25 02:23:50.000000000 +0700
-+++ linux-4.7/net/core/skbuff.c        2016-07-26 20:58:55.645901708 +0700
-@@ -81,6 +81,87 @@ struct kmem_cache *skbuff_head_cache __r
+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
  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);
@@ -1384,7 +1367,7 @@ diff -Naupr linux-4.7_orig/net/core/skbuff.c linux-4.7/net/core/skbuff.c
  
  /**
   *    skb_panic - private function for out-of-line support
-@@ -653,6 +734,28 @@ static void skb_release_head_state(struc
+@@ -654,6 +735,28 @@ static void skb_release_head_state(struc
                WARN_ON(in_irq());
                skb->destructor(skb);
        }
@@ -1413,7 +1396,7 @@ diff -Naupr linux-4.7_orig/net/core/skbuff.c linux-4.7/net/core/skbuff.c
  #if IS_ENABLED(CONFIG_NF_CONNTRACK)
        nf_conntrack_put(skb->nfct);
  #endif
-@@ -842,6 +945,10 @@ static void __copy_skb_header(struct sk_
+@@ -843,6 +946,10 @@ static void __copy_skb_header(struct sk_
        new->sp                 = secpath_get(old->sp);
  #endif
        __nf_copy(new, old, false);
@@ -1424,7 +1407,7 @@ diff -Naupr linux-4.7_orig/net/core/skbuff.c linux-4.7/net/core/skbuff.c
  
        /* 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
-@@ -3433,6 +3540,13 @@ void __init skb_init(void)
+@@ -3439,6 +3546,13 @@ void __init skb_init(void)
                                                0,
                                                SLAB_HWCACHE_ALIGN|SLAB_PANIC,
                                                NULL);
@@ -1438,9 +1421,9 @@ diff -Naupr linux-4.7_orig/net/core/skbuff.c linux-4.7/net/core/skbuff.c
  }
  
  /**
-diff -Naupr linux-4.7_orig/net/ipv6/ip6_output.c linux-4.7/net/ipv6/ip6_output.c
---- linux-4.7_orig/net/ipv6/ip6_output.c       2016-07-25 02:23:50.000000000 +0700
-+++ linux-4.7/net/ipv6/ip6_output.c    2016-07-26 20:58:55.645901708 +0700
+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
        struct in6_addr *nexthop;
        int ret;
@@ -1465,10 +1448,10 @@ diff -Naupr linux-4.7_orig/net/ipv6/ip6_output.c linux-4.7/net/ipv6/ip6_output.c
        return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING,
                            net, sk, skb, NULL, dev,
                            ip6_finish_output,
-diff -Naupr linux-4.7_orig/net/netfilter/core.c linux-4.7/net/netfilter/core.c
---- linux-4.7_orig/net/netfilter/core.c        2016-07-25 02:23:50.000000000 +0700
-+++ linux-4.7/net/netfilter/core.c     2016-07-26 20:58:55.645901708 +0700
-@@ -311,9 +311,11 @@ next_hook:
+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;
@@ -1480,12 +1463,15 @@ diff -Naupr linux-4.7_orig/net/netfilter/core.c linux-4.7/net/netfilter/core.c
 +                                 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))
-diff -Naupr linux-4.7_orig/net/netfilter/Kconfig linux-4.7/net/netfilter/Kconfig
---- linux-4.7_orig/net/netfilter/Kconfig       2016-07-25 02:23:50.000000000 +0700
-+++ linux-4.7/net/netfilter/Kconfig    2016-07-26 20:58:55.645901708 +0700
-@@ -807,6 +807,18 @@ config NETFILTER_XT_TARGET_LOG
+                               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
  
          To compile it as a module, choose M here.  If unsure, say N.
  
@@ -1504,9 +1490,9 @@ diff -Naupr linux-4.7_orig/net/netfilter/Kconfig linux-4.7/net/netfilter/Kconfig
  config NETFILTER_XT_TARGET_MARK
        tristate '"MARK" target support'
        depends on NETFILTER_ADVANCED
-diff -Naupr linux-4.7_orig/net/netfilter/Makefile linux-4.7/net/netfilter/Makefile
---- linux-4.7_orig/net/netfilter/Makefile      2016-07-25 02:23:50.000000000 +0700
-+++ linux-4.7/net/netfilter/Makefile   2016-07-26 20:58:55.645901708 +0700
+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) +=
  obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o
@@ -1515,9 +1501,9 @@ diff -Naupr linux-4.7_orig/net/netfilter/Makefile linux-4.7/net/netfilter/Makefi
  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.7_orig/net/netfilter/nf_internals.h linux-4.7/net/netfilter/nf_internals.h
---- linux-4.7_orig/net/netfilter/nf_internals.h        2016-07-25 02:23:50.000000000 +0700
-+++ linux-4.7/net/netfilter/nf_internals.h     2016-07-26 20:58:55.645901708 +0700
+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 */
@@ -1527,9 +1513,9 @@ diff -Naupr linux-4.7_orig/net/netfilter/nf_internals.h linux-4.7/net/netfilter/
  void nf_queue_nf_hook_drop(struct net *net, struct nf_hook_ops *ops);
  int __init netfilter_queue_init(void);
  
-diff -Naupr linux-4.7_orig/net/netfilter/nf_queue.c linux-4.7/net/netfilter/nf_queue.c
---- linux-4.7_orig/net/netfilter/nf_queue.c    2016-07-25 02:23:50.000000000 +0700
-+++ linux-4.7/net/netfilter/nf_queue.c 2016-07-26 20:58:55.649235058 +0700
+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
 @@ -27,6 +27,23 @@
   * receives, no matter what.
   */
@@ -1595,9 +1581,9 @@ diff -Naupr linux-4.7_orig/net/netfilter/nf_queue.c linux-4.7/net/netfilter/nf_q
                if (err < 0) {
                        if (err == -ESRCH &&
                           (verdict & NF_VERDICT_FLAG_QUEUE_BYPASS))
-diff -Naupr linux-4.7_orig/net/netfilter/xt_IMQ.c linux-4.7/net/netfilter/xt_IMQ.c
---- linux-4.7_orig/net/netfilter/xt_IMQ.c      1970-01-01 07:00:00.000000000 +0700
-+++ linux-4.7/net/netfilter/xt_IMQ.c   2016-07-26 20:58:55.649235058 +0700
+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
 @@ -0,0 +1,72 @@
 +/*
 + * This target marks packets to be enqueued to an imq device
@@ -1671,10 +1657,10 @@ diff -Naupr linux-4.7_orig/net/netfilter/xt_IMQ.c linux-4.7/net/netfilter/xt_IMQ
 +MODULE_ALIAS("ipt_IMQ");
 +MODULE_ALIAS("ip6t_IMQ");
 +
-diff -Naupr linux-4.7_orig/net/sched/sch_generic.c linux-4.7/net/sched/sch_generic.c
---- linux-4.7_orig/net/sched/sch_generic.c     2016-07-25 02:23:50.000000000 +0700
-+++ linux-4.7/net/sched/sch_generic.c  2016-07-26 20:58:55.649235058 +0700
-@@ -110,6 +110,14 @@ static struct sk_buff *dequeue_skb(struc
+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:
        return skb;
  }
  
@@ -1688,4 +1674,4 @@ diff -Naupr linux-4.7_orig/net/sched/sch_generic.c linux-4.7/net/sched/sch_gener
 +
  /*
   * Transmit possibly several skbs, and handle the return status as
-  * required. Holding the __QDISC___STATE_RUNNING bit guarantees that
+  * required. Owning running seqcount bit guarantees that
The Linux kernel (the core of the Linux operating system)
This page took 0.062175 seconds and 4 git commands to generate.