commit 5f467116570fdb00e9574fa57cda37ee002b5c93
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Sat Oct 26 17:58:00 2013 +0200
- applies to 3.12rc6 now
kernel-imq.patch | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/kernel-imq.patch b/kernel-imq.patch
index 8804a3b..41e8c0f 100644
--- a/kernel-imq.patch
+++ b/kernel-imq.patch
@@ -1282,17 +1282,17 @@ index dec1748..1f17280 100644
#ifdef CONFIG_BRIDGE_NETFILTER
struct nf_bridge_info *nf_bridge;
#endif
-@@ -497,6 +506,10 @@ struct sk_buff {
- /* 7/9 bit hole (depending on ndisc_nodetype presence) */
+@@ -510,6 +510,10 @@ struct sk_buff {
+ /* 6/8 bit hole (depending on ndisc_nodetype presence) */
kmemcheck_bitfield_end(flags2);
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
+ __u8 imq_flags:IMQ_F_BITS;
+#endif
+
- #ifdef CONFIG_NET_DMA
- dma_cookie_t dma_cookie;
- #endif
+ #if defined CONFIG_NET_DMA || defined CONFIG_NET_RX_BUSY_POLL
+ union {
+ unsigned int napi_id;
@@ -626,6 +639,12 @@ static inline struct rtable *skb_rtable(const struct
sk_buff *skb)
return (struct rtable *)skb_dst(skb);
}
@@ -1353,9 +1353,9 @@ index 7ddbb31..125b7b9 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -129,6 +129,9 @@
- #include <linux/inetdevice.h>
- #include <linux/cpu_rmap.h>
#include <linux/static_key.h>
+ #include <linux/hashtable.h>
+ #include <linux/vmalloc.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/5f467116570fdb00e9574fa57cda37ee002b5c93
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
