[netfilter-cvslog] r3338 - in trunk/nfsim: core kernelenv/include

[rusty at netfilter.org]

Author: rusty at netfilter.org
Date: 2004-12-13 05:11:27 +0100 (Mon, 13 Dec 2004)
New Revision: 3338

Modified:
   trunk/nfsim/core/core.h
   trunk/nfsim/kernelenv/include/kernelenv.h
Log:
Handle ip_ct_attach in kernelenv.h, not core.h and kernelenv.h.


Modified: trunk/nfsim/core/core.h
===================================================================
--- trunk/nfsim/core/core.h	2004-12-13 04:06:11 UTC (rev 3337)
+++ trunk/nfsim/core/core.h	2004-12-13 04:11:27 UTC (rev 3338)
@@ -211,12 +211,6 @@
 
 #include <ipv4/ipv4.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)
-void (*ip_ct_attach)(struct sk_buff *, struct nf_ct_info *);
-#else
-void (*ip_ct_attach)(struct sk_buff *, struct sk_buff *);
-#endif
-
 void stop(void);
 
 static inline int complete_read(int fd, char *buf, int len)

Modified: trunk/nfsim/kernelenv/include/kernelenv.h
===================================================================
--- trunk/nfsim/kernelenv/include/kernelenv.h	2004-12-13 04:06:11 UTC (rev 3337)
+++ trunk/nfsim/kernelenv/include/kernelenv.h	2004-12-13 04:11:27 UTC (rev 3338)
@@ -483,6 +483,7 @@
 	if (nfct)
 		atomic_inc(&nfct->master->use);
 }
+void (*ip_ct_attach)(struct sk_buff *, struct nf_ct_info *);
 #else
 static inline void nf_conntrack_put(struct nf_conntrack *nfct)
 {
@@ -508,9 +509,9 @@
 	skb->nf_debug = 0;
 #endif
 }
+void (*ip_ct_attach)(struct sk_buff *, struct sk_buff *);
 #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);