42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
|
parent fe8800c8ad505196d4cde9fca21d868751760c9f (v6.11)
|
||
|
|
commit 94daadfc825c504dcb9bd510b895c6c673229b60
|
||
|
|
Author: Henry Culver <henry@culcon.com>
|
||
|
|
Date: Fri Jan 20 13:40:55 2012 +0100
|
||
|
|
|
||
|
|
Fix the inclusion of linux/export.h
|
||
|
|
|
||
|
|
The tests for inclusion of linux/export.h in
|
||
|
|
ipset-6.11:kernel/net/netfilter/ipset/{ip_set_getport.c,pfxlen.c} are
|
||
|
|
incorrect, linux/export.h did not go in until 3.2.0.
|
||
|
|
---
|
||
|
|
kernel/net/netfilter/ipset/ip_set_getport.c | 2 +-
|
||
|
|
kernel/net/netfilter/ipset/pfxlen.c | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/kernel/net/netfilter/ipset/ip_set_getport.c b/kernel/net/netfilter/ipset/ip_set_getport.c
|
||
|
|
index 0f77a53..a66c67b 100644
|
||
|
|
--- a/kernel/net/netfilter/ipset/ip_set_getport.c
|
||
|
|
+++ b/kernel/net/netfilter/ipset/ip_set_getport.c
|
||
|
|
@@ -8,7 +8,7 @@
|
||
|
|
/* Get Layer-4 data from the packets */
|
||
|
|
|
||
|
|
#include <linux/version.h>
|
||
|
|
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)
|
||
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
|
||
|
|
#include <linux/export.h>
|
||
|
|
#endif
|
||
|
|
#include <linux/ip.h>
|
||
|
|
diff --git a/kernel/net/netfilter/ipset/pfxlen.c b/kernel/net/netfilter/ipset/pfxlen.c
|
||
|
|
index c5191c7..56ca480 100644
|
||
|
|
--- a/kernel/net/netfilter/ipset/pfxlen.c
|
||
|
|
+++ b/kernel/net/netfilter/ipset/pfxlen.c
|
||
|
|
@@ -1,5 +1,5 @@
|
||
|
|
#include <linux/version.h>
|
||
|
|
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)
|
||
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
|
||
|
|
#include <linux/export.h>
|
||
|
|
#endif
|
||
|
|
#include <linux/netfilter/ipset/pfxlen.h>
|
||
|
|
--
|
||
|
|
# Created with git-export-patch
|