patch-2.1.9 linux/include/net/sock.h

• Lines: 46
• Date: Tue Nov 12 15:17:03 1996
• Orig file: v2.1.8/linux/include/net/sock.h
• Orig date: Sun Nov 10 20:12:17 1996

diff -u --recursive --new-file v2.1.8/linux/include/net/sock.h linux/include/net/sock.h
@@ -49,11 +49,14 @@
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>	/* struct sk_buff */
 #include <net/protocol.h>		/* struct inet_protocol */
-#ifdef CONFIG_AX25
+#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
 #include <net/ax25.h>
-#ifdef CONFIG_NETROM
+#if defined(CONFIG_NETROM) || defined(CONFIG_NETROM_MODULE)
 #include <net/netrom.h>
 #endif
+#if defined(CONFIG_ROSE) || defined(CONFIG_ROSE_MODULE)
+#include <net/rose.h>
+#endif
 #endif
 
 #if defined(CONFIG_IPX) || defined(CONFIG_IPX_MODULE)
@@ -403,12 +406,6 @@
 	int			sndbuf;
 	unsigned short		type;
 	unsigned char		localroute;	/* Route locally only */
-#ifdef CONFIG_AX25
-	ax25_cb			*ax25;
-#ifdef CONFIG_NETROM
-	nr_cb			*nr;
-#endif
-#endif
   
 /*
  *	This is where all the private (optional) areas that don't
@@ -429,6 +426,15 @@
 #ifdef CONFIG_NUTCP		
 		struct tcp_opt		af_tcp;
 #endif		
+#endif
+#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
+		ax25_cb			*ax25;
+#if defined(CONFIG_NETROM) || defined(CONFIG_NETROM_MODULE)
+		nr_cb			*nr;
+#endif
+#if defined(CONFIG_ROSE) || defined(CONFIG_ROSE_MODULE)
+		rose_cb			*rose;
+#endif
 #endif
 	} protinfo;