patch-1.3.78 linux/include/net/sock.h
Next file: linux/init/main.c
Previous file: linux/include/net/psnap.h
Back to the patch index
Back to the overall index
- Lines: 50
- Date:
Mon Mar 25 10:24:40 1996
- Orig file:
v1.3.77/linux/include/net/sock.h
- Orig date:
Thu Mar 21 20:36:54 1996
diff -u --recursive --new-file v1.3.77/linux/include/net/sock.h linux/include/net/sock.h
@@ -46,10 +46,12 @@
#include <net/netrom.h>
#endif
#endif
-#ifdef CONFIG_IPX
+
+#if defined(CONFIG_IPX) || defined(CONFIG_IPX_MODULE)
#include <net/ipx.h>
#endif
-#ifdef CONFIG_ATALK
+
+#if defined(CONFIG_ATALK) || defined(CONFIG_ATALK_MODULE)
#include <linux/atalk.h>
#endif
@@ -73,6 +75,9 @@
struct inode * inode;
struct semaphore readsem;
struct sock * other;
+ int marksweep;
+#define MARKED 1
+ int inflight;
};
/*
@@ -92,7 +97,7 @@
* Once the IPX ncpd patches are in these are going into protinfo
*/
-#ifdef CONFIG_IPX
+#if defined(CONFIG_IPX) || defined(CONFIG_IPX_MODULE)
struct ipx_opt
{
ipx_address dest_addr;
@@ -261,12 +266,12 @@
union
{
struct unix_opt af_unix;
-#ifdef CONFIG_ATALK
+#if defined(CONFIG_ATALK) || defined(CONFIG_ATALK_MODULE)
struct atalk_sock af_at;
#endif
-#ifdef CONFIG_IPX
+#if defined(CONFIG_IPX) || defined(CONFIG_IPX_MODULE)
struct ipx_opt af_ipx;
-#endif
+#endif
#ifdef CONFIG_INET
struct inet_packet_opt af_packet;
#ifdef CONFIG_NUTCP
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov
with Sam's (original) version of this