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

[gandalf at netfilter.org]

Author: gandalf at netfilter.org
Date: 2005-01-04 22:54:49 +0100 (Tue, 04 Jan 2005)
New Revision: 3570

Modified:
   trunk/nfsim/kernelenv/include/kernelenv.h
Log:
Update to work with the struct inet_sock/inet_opt changes in 2.6-bk while still working with older kernels.


Modified: trunk/nfsim/kernelenv/include/kernelenv.h
===================================================================
--- trunk/nfsim/kernelenv/include/kernelenv.h	2005-01-04 20:37:16 UTC (rev 3569)
+++ trunk/nfsim/kernelenv/include/kernelenv.h	2005-01-04 21:54:49 UTC (rev 3570)
@@ -703,7 +703,10 @@
   unsigned char __data[0];
 };
 
-struct inet_opt {
+struct inet_sock {
+	/* sk has to be the first two members of inet_sock */
+	struct sock		sk;
+	/* Socket demultiplex comparisons on incoming packets. */
 	__u32			daddr;		/* Foreign IPv4 addr */
 	__u32			rcv_saddr;	/* Bound local IPv4 addr */
 	__u16			dport;		/* Destination port */
@@ -725,16 +728,11 @@
 	__u32			mc_addr;
 };
 
+#define inet_opt inet_sock
 
-/* WARNING: don't change the layout of the members in inet_sock! */
-struct inet_sock {
-	struct sock	  sk;
-	struct inet_opt   inet;
-};
+#define inet_sk(__sk) ((struct inet_sock *)__sk)
 
-#define inet_sk(__sk) (&((struct inet_sock *)__sk)->inet)
 
-
 /* rtnetlink.h */
 enum
 {