- 3.18.18

diff --git a/kernel-imq.patch b/kernel-imq.patch
index baebad1e4be8a779bd9ba6d51c51fba4a9c58d47..a51430bb2aefb8fef99ceaf9d5398196286dd348 100644 (file)
--- a/kernel-imq.patch
+++ b/kernel-imq.patch
@@ -1632,9 +1632,9 @@ index 3deec99..c1a1397 100644
             struct net_device *outdev, int (*okfn)(struct sk_buff *),
 -           unsigned int queuenum);
 +           unsigned int queuenum, unsigned int queuetype);
+ void nf_queue_nf_hook_drop(struct nf_hook_ops *ops);
  int __init netfilter_queue_init(void);
  
- /* nf_log.c */
 diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
 index 5d24b1f..28317dc 100644
 --- a/net/netfilter/nf_queue.c

diff --git a/kernel.spec b/kernel.spec
index b740ea2616c9cab97503f4fab5360261857e18df..940048ce0dd0a70020c7102c27213838059a51cd 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -72,7 +72,7 @@
 
 %define                rel             1
 %define                basever         3.18
-%define                postver         .17
+%define                postver         .18
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       -%{basever}
@@ -121,7 +121,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
 # Source0-md5: 9e854df51ca3fef8bfe566dbd7b89241
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5:  ff54e954e26589a2a8a237bfe793ac41
+# Patch0-md5:  8d2baec3d5817eb5501d5b1141279ef6
 %endif
 Source1:       kernel.sysconfig