- up to 3.17.2; updated imq patch

diff --git a/kernel-imq.patch b/kernel-imq.patch
index 12bd3d3b045c7617a17b5ab13c6c3cac5b8f2589..a4fa229965e25fd280b664afb981a9fea781a65d 100644 (file)
--- a/kernel-imq.patch
+++ b/kernel-imq.patch
@@ -1071,7 +1071,7 @@ index 0000000..801bc8c
 +      struct net_device *dev;
 +      int ret;
 +
-+      dev = alloc_netdev_mq(0, "imq%d", imq_setup, numqueues);
++      dev = alloc_netdev_mq(0, "imq%d", NET_NAME_UNKNOWN, imq_setup, numqueues);
 +      if (!dev)
 +              return -ENOMEM;
 +
@@ -1298,7 +1298,7 @@ index f66f346..d699b19 100644
 @@ -490,6 +490,9 @@ struct sk_buff {
        __u8                    csum_valid:1;
        __u8                    csum_complete_sw:1;
-       /* 3/5 bit hole (depending on ndisc_nodetype presence) */
+       /* 2/4 bit hole (depending on ndisc_nodetype presence) */
 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
 +      __u8                    imq_flags:IMQ_F_BITS;
 +#endif
@@ -1365,9 +1365,9 @@ index 3d13874..9842f21 100644
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
 @@ -131,6 +131,9 @@
- #include <linux/hashtable.h>
  #include <linux/vmalloc.h>
  #include <linux/if_macvlan.h>
+ #include <linux/errqueue.h>
 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
 +#include <linux/imq.h>
 +#endif

diff --git a/kernel.spec b/kernel.spec
index ff1fde4e4c720ad50b573aef693543cd59ad83af..05a0d49e951143c0756f64551572682b5a920f83 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -70,7 +70,7 @@
 
 %define                rel             0.1
 %define                basever         3.17
-%define                postver         .0
+%define                postver         .2
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
@@ -116,7 +116,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
 # Source0-md5: fb30d0f29214d75cddd2faa94f73d5cf
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5:  bdd448061d612ac2f87b5cf28b13bbe4
+# Patch0-md5:  d694b8625f834791f5e02d7c9add1406
 %endif
 Source1:       kernel.sysconfig