Fix to compile ipset with 2.4.26.x tree statically.

diff --git a/ChangeLog b/ChangeLog
index 3ae9066df47bb7fa6d66851b35d175eb4a8d560a..409adab50f836e311421cc343fa47b33e3503e51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,13 @@
-[2.3.3]
+2.3.3a
+ - Fix to compile ipset with 2.4.26.x tree statically (bug reported by
+   G.W. Haywood)
+
+2.3.3
  - compatibility for the 2.6.x kernel tree improved and compiler warnings
    fixed (Jan Engelhardt)
  - compatibility fixes for the 2.4.36.x kernel tree added
 
-[2.3.2]
+2.3.2
  - including limits.h for UINT_MAX is required with glibc-2.8 (pud)
  - needless cast from and to void pointers cleanups in iptreemap (Sven Wegener)
  - Initial ipset release with kernel modules included.

diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_compat.h b/kernel/include/linux/netfilter_ipv4/ip_set_compat.h
index 8803d4fa8f4202d233f4cce1d36d13e572d60924..5695b3b813c8f30343b1e79038a1b0b65657dbe6 100644 (file)
--- a/kernel/include/linux/netfilter_ipv4/ip_set_compat.h
+++ b/kernel/include/linux/netfilter_ipv4/ip_set_compat.h
@@ -9,7 +9,7 @@
 #define __MOD_INC(foo)         __MOD_INC_USE_COUNT(foo)
 #define __MOD_DEC(foo)         __MOD_DEC_USE_COUNT(foo)
 #else
-#define __MOD_INC(foo)
+#define __MOD_INC(foo)         1
 #define __MOD_DEC(foo)
 #endif
 
@@ -25,7 +25,7 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 #include <linux/interrupt.h>
 #define DEFINE_RWLOCK(x)                rwlock_t x = RW_LOCK_UNLOCKED
-#define try_module_get(x)               (__MOD_INC(x), 1)
+#define try_module_get(x)              __MOD_INC(x)
 #define module_put(x)                   __MOD_DEC(x)
 #define __clear_bit(nr, addr)          clear_bit(nr, addr)
 #define __set_bit(nr, addr)            set_bit(nr, addr)