From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 22 Mar 2017 16:59:20 +0000 (+0100)
Subject: kernel-wfp: Don't redefine IPPROTO_IP* if already defined
X-Git-Tag: 5.5.2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d240b0761a249f433573ae1ef3b5a758795b7b7;p=thirdparty%2Fstrongswan.git

kernel-wfp: Don't redefine IPPROTO_IP* if already defined
---

diff --git a/src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c b/src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c
index 6ad26b72fc..774fcf5c81 100644
--- a/src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c
+++ b/src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c
@@ -25,8 +25,12 @@
 #include <collections/hashtable.h>
 #include <processing/jobs/callback_job.h>
 
+#ifndef IPPROTO_IPIP
 #define IPPROTO_IPIP 4
+#endif
+#ifndef IPPROTO_IPV6
 #define IPPROTO_IPV6 41
+#endif
 
 typedef struct private_kernel_wfp_ipsec_t private_kernel_wfp_ipsec_t;