[netfilter-cvslog] r3286 - trunk/nfsim/kernelenv/include

[rusty at netfilter.org]

Author: rusty at netfilter.org
Date: 2004-11-20 07:41:22 +0100 (Sat, 20 Nov 2004)
New Revision: 3286

Modified:
   trunk/nfsim/kernelenv/include/kernelenv.h
Log:
More fixes for recent kernels.


Modified: trunk/nfsim/kernelenv/include/kernelenv.h
===================================================================
--- trunk/nfsim/kernelenv/include/kernelenv.h	2004-11-19 02:24:11 UTC (rev 3285)
+++ trunk/nfsim/kernelenv/include/kernelenv.h	2004-11-20 06:41:22 UTC (rev 3286)
@@ -118,7 +118,7 @@
 #define schedule()
 
 #define BUG_ON(x) assert(!(x))
-#define BUG() barf(__FILE__)
+#define BUG() assert(0)
 
 #define cli()
 #define sti()
@@ -504,6 +504,9 @@
 }
 #endif /* 2.6.9 */
 
+extern void (*ip_ct_attach)(struct sk_buff *, struct sk_buff *);
+extern void nf_ct_attach(struct sk_buff *, struct sk_buff *);
+
 struct sk_buff *alloc_skb(unsigned int size, int gfp_mask);
 void kfree_skb(struct sk_buff *skb);
 
@@ -883,7 +886,9 @@
 		(x)->oline = __LINE__; \
 	} while (0)
 
+#define rwlock_init(x) spin_lock_init(x)
 
+
 #define spin_lock(x) __generic_write_lock((x), __FILE__, __LINE__)
 #define spin_unlock(x) __generic_write_unlock((x), __FILE__, __LINE__)