r7560 - in trunk/ipset: . kernel/include/linux/netfilter_ipv4

[kadlec at blackhole.kfki.hu]

Author: kadlec at blackhole.kfki.hu
Date: 2008-07-20 21:41:03 +0200 (Sun, 20 Jul 2008)
New Revision: 7560

Modified:
   trunk/ipset/ChangeLog
   trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_compat.h
Log:
Fix to compile ipset with 2.4.26.x tree statically.


Modified: trunk/ipset/ChangeLog
===================================================================
--- trunk/ipset/ChangeLog	2008-07-19 20:48:19 UTC (rev 7559)
+++ trunk/ipset/ChangeLog	2008-07-20 19:41:03 UTC (rev 7560)
@@ -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.

Modified: trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_compat.h
===================================================================
--- trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_compat.h	2008-07-19 20:48:19 UTC (rev 7559)
+++ trunk/ipset/kernel/include/linux/netfilter_ipv4/ip_set_compat.h	2008-07-20 19:41:03 UTC (rev 7560)
@@ -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)