- 3.13.3

- fixed IMQ patch for skbuff.c changes in 3.13.3

diff --git a/kernel-imq.patch b/kernel-imq.patch
index 25e59634c1eac5cac81071491d6daf8b7cb2dd4b..6f4c7b2d6db5fa46786125a790fe796f5c784fe3 100644 (file)
--- a/kernel-imq.patch
+++ b/kernel-imq.patch
@@ -1391,21 +1391,13 @@ diff --git a/net/core/skbuff.c b/net/core/skbuff.c
 index c28c7fe..a5f1888 100644
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c
-@@ -73,6 +73,9 @@
+@@ -73,6 +73,84 @@
  
  struct kmem_cache *skbuff_head_cache __read_mostly;
  static struct kmem_cache *skbuff_fclone_cache __read_mostly;
 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
 +static struct kmem_cache *skbuff_cb_store_cache __read_mostly;
-+#endif
- 
- static void sock_pipe_buf_release(struct pipe_inode_info *pipe,
-                                 struct pipe_buffer *buf)
-@@ -92,6 +95,82 @@ static int sock_pipe_buf_steal(struct pipe_inode_info *pipe,
-       return 1;
- }
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++
 +/* Control buffer save/restore for IMQ devices */
 +struct skb_cb_table {
 +      char                    cb[48] __aligned(8);
@@ -1482,8 +1474,8 @@ index c28c7fe..a5f1888 100644
 +}
 +#endif
  
- /* Pipe buffer operations for a socket. */
- static const struct pipe_buf_operations sock_pipe_buf_ops = {
+ /**
+  *    skb_panic - private function for out-of-line support
 @@ -577,6 +656,28 @@ static void skb_release_head_state(struct sk_buff *skb)
                WARN_ON(in_irq());
                skb->destructor(skb);

diff --git a/kernel.spec b/kernel.spec
index 5e931b4f1ec252e629c48f11d22ed35e75b2b2b6..de80ada6212bc163c776f1da641809c303e2b34e 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -68,7 +68,7 @@
 
 %define                rel             1
 %define                basever         3.13
-%define                postver         .2
+%define                postver         .3
 
 # __alt_kernel is list of features, empty string if none set
 # _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros)
@@ -111,7 +111,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
 # Source0-md5: 0ecbaf65c00374eb4a826c2f9f37606f
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5:  352993d23acc5760dafa10ffc9d8881a
+# Patch0-md5:  2d3d298f2b430122f4baf2af88277231
 %endif
 Source1:       kernel.sysconfig