From 2602d4b76b86fff783a3f5e59ef84cea7b4b5dc8 Mon Sep 17 00:00:00 2001
From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Wed, 28 Oct 2015 17:14:28 +0100
Subject: Compatibility: include linux/export.h when needed

---
 .../linux/netfilter/ipset/ip_set_compat.h.in       | 49 ++++++++++++----------
 kernel/net/netfilter/ipset/ip_set_getport.c        |  3 --
 kernel/net/netfilter/ipset/pfxlen.c                |  5 +--
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in
index d2cab54..33f14eb 100644
--- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in
+++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in
@@ -1,24 +1,9 @@
 #ifndef __IP_SET_COMPAT_H
 #define __IP_SET_COMPAT_H
 
-#ifndef CONFIG_IP_SET_MAX
-#ifdef IP_SET_MAX
-#define CONFIG_IP_SET_MAX	IP_SET_MAX
-#else
-#define CONFIG_IP_SET_MAX	256
-#endif
-#endif
-
-#ifndef IS_ENABLED
-#define __X_ARG_PLACEHOLDER_1 0,
-#define x_config_enabled(cfg) _x_config_enabled(cfg)
-#define _x_config_enabled(value) __x_config_enabled(__X_ARG_PLACEHOLDER_##value)
-#define __x_config_enabled(arg1_or_junk) ___x_config_enabled(arg1_or_junk 1, 0)
-#define ___x_config_enabled(__ignored, val, ...) val
-
-#define IS_ENABLED(option) \
-	(x_config_enabled(option) || x_config_enabled(option##_MODULE))
-#endif
+/* Not everything could be moved here. Compatibility stuffs can be found in
+ * xt_set.c, ip_set_core.c, ip_set_getport.c, pfxlen.c too.
+ */
 
 #@HAVE_STRUCT_XT_ACTION_PARAM@ HAVE_STRUCT_XT_ACTION_PARAM
 #@HAVE_VZALLOC@ HAVE_VZALLOC
@@ -46,9 +31,30 @@
 #@HAVE_NF_BRIDGE_GET_PHYSDEV@ HAVE_NF_BRIDGE_GET_PHYSDEV
 #@HAVE_NLA_PUT_IN_ADDR@ HAVE_NLA_PUT_IN_ADDR
 
-/* Not everything could be moved here. Compatibility stuffs can be found in
- * xt_set.c, ip_set_core.c, ip_set_getport.c, pfxlen.c too.
- */
+#ifdef HAVE_EXPORT_H
+#include <linux/export.h>
+#endif
+
+#ifndef IP_SET_COMPAT_HEADERS
+
+#ifndef CONFIG_IP_SET_MAX
+#ifdef IP_SET_MAX
+#define CONFIG_IP_SET_MAX	IP_SET_MAX
+#else
+#define CONFIG_IP_SET_MAX	256
+#endif
+#endif
+
+#ifndef IS_ENABLED
+#define __X_ARG_PLACEHOLDER_1 0,
+#define x_config_enabled(cfg) _x_config_enabled(cfg)
+#define _x_config_enabled(value) __x_config_enabled(__X_ARG_PLACEHOLDER_##value)
+#define __x_config_enabled(arg1_or_junk) ___x_config_enabled(arg1_or_junk 1, 0)
+#define ___x_config_enabled(__ignored, val, ...) val
+
+#define IS_ENABLED(option) \
+	(x_config_enabled(option) || x_config_enabled(option##_MODULE))
+#endif
 
 #include <linux/version.h>
 #include <linux/netlink.h>
@@ -263,4 +269,5 @@ static inline int nla_put_in6_addr(struct sk_buff *skb, int attrtype,
 #define SIZE_MAX	(~(size_t)0)
 #endif
 
+#endif /* IP_SET_COMPAT_HEADERS */
 #endif /* __IP_SET_COMPAT_H */
diff --git a/kernel/net/netfilter/ipset/ip_set_getport.c b/kernel/net/netfilter/ipset/ip_set_getport.c
index b82f769..528e94c 100644
--- a/kernel/net/netfilter/ipset/ip_set_getport.c
+++ b/kernel/net/netfilter/ipset/ip_set_getport.c
@@ -8,9 +8,6 @@
 /* Get Layer-4 data from the packets */
 
 #include <linux/version.h>
-#ifdef HAVE_EXPORT_H
-#include <linux/export.h>
-#endif
 #include <linux/ip.h>
 #include <linux/skbuff.h>
 #include <linux/icmp.h>
diff --git a/kernel/net/netfilter/ipset/pfxlen.c b/kernel/net/netfilter/ipset/pfxlen.c
index 41c7f44..124b357 100644
--- a/kernel/net/netfilter/ipset/pfxlen.c
+++ b/kernel/net/netfilter/ipset/pfxlen.c
@@ -1,7 +1,6 @@
 #include <linux/version.h>
-#ifdef HAVE_EXPORT_H
-#include <linux/export.h>
-#endif
+#define IP_SET_COMPAT_HEADERS
+#include <linux/netfilter/ipset/ip_set_compat.h>
 #include <linux/netfilter/ipset/pfxlen.h>
 
 /* Prefixlen maps for fast conversions, by Jan Engelhardt. */
-- 
cgit v1.2.3