Added the code for xid matching. (The code is not yet enabled)

[ipfw.git] / dummynet / include / sys / malloc.h

diff --git a/dummynet/include/sys/malloc.h b/dummynet/include/sys/malloc.h
index d103801..03b9dfb 100644 (file)
--- a/dummynet/include/sys/malloc.h
+++ b/dummynet/include/sys/malloc.h
@@ -8,11 +8,10 @@
  */
 #ifndef _WIN32 /* this is the linux version */
 
-#ifndef LINUX_24
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22)
+#if !defined (LINUX_24) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22)
 #define malloc(_size, type, flags)                     \
        kmalloc(_size, GFP_ATOMIC | __GFP_ZERO)
-#else /* LINUX < 2.6.22 and LINUX_24 */
+#else /* LINUX <= 2.6.22 and LINUX_24 */
 /* linux 2.6.22 does not zero allocated memory */
 #define malloc(_size, type, flags)                     \
        ({ int _s = _size;                              \
@@ -20,8 +19,7 @@
        if (_ret) memset(_ret, 0, _s);                  \
         (_ret);                                                \
         })
-#endif /* !LINUX_24 */
-#endif /* LINUX < 2.6.22 */
+#endif /* LINUX <= 2.6.22 */
 
 #define calloc(_n, _s) malloc((_n * _s), NULL, GFP_ATOMIC | __GFP_ZERO)
 #define free(_var, type) kfree(_var)