[packages/kernel] - up to 3.17.2; updated imq patch
arekm
arekm at pld-linux.org
Wed Nov 5 23:15:58 CET 2014
commit a1e1a866eb66a94a00bfc7c3c51fb8a3050272b5
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Nov 5 23:15:46 2014 +0100
- up to 3.17.2; updated imq patch
kernel-imq.patch | 6 +++---
kernel.spec | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index ff1fde4..05a0d49 100644
--- 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
diff --git a/kernel-imq.patch b/kernel-imq.patch
index 12bd3d3..a4fa229 100644
--- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/a1e1a866eb66a94a00bfc7c3c51fb8a3050272b5
More information about the pld-cvs-commit
mailing list