Skip to contentSkip to conversation

ipset-6.11 patch to fix inclusion of linux/export.h

PATCH Henry Culver 2 participants 3 messages Jan 19, 2012 – Jan 20, 2012 netfilter

lore
Share & tools
lore
#0 lore raw

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, check the 3.2 patch set. Attached is a patch to correct this.

-Henry Culver

kernel/net/netfilter/ipset/ip_set_getport.c +1 -1
diff -uprN ipset-6.11/kernel/net/netfilter/ipset/ip_set_getport.c ipset-6.11-patched/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>
kernel/net/netfilter/ipset/pfxlen.c +1 -1
diff -uprN ipset-6.11/kernel/net/netfilter/ipset/pfxlen.c ipset-6.11-patched/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>
#1 lore raw
Quoted 4 lines · Henry Culver

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, check the 3.2 patch set. Attached is a patch to correct this.

Thanks, I'll release an updated version.

Best regards,
Jozsef
-
E-mail : [email protected], [email protected] PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences

          H-1525 Budapest 114, POB. 49, Hungary
#2 lore raw
Quoted 8 lines · Jozsef Kadlecsik
Quoted 4 lines · Henry Culver

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, check the 3.2 patch set. Attached is a patch to correct this.

Thanks, I'll release an updated version.

Committed and pushed to the repository, thanks again.

Best regards,
Jozsef
-
E-mail : [email protected], [email protected] PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences

          H-1525 Budapest 114, POB. 49, Hungary