patch-2.3.99-pre7 linux/include/net/sock.h

• Lines: 59
• Date: Thu May 11 11:27:15 2000
• Orig file: v2.3.99-pre6/linux/include/net/sock.h
• Orig date: Wed Apr 26 16:34:09 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/include/net/sock.h linux/include/net/sock.h
@@ -66,6 +66,11 @@
 #endif
 #endif
 
+#if defined(CONFIG_PPPOE) || defined(CONFIG_PPPOE_MODULE)
+#include <linux/if_pppox.h>
+#include <linux/ppp_channel.h>   /* struct ppp_channel */
+#endif
+
 #if defined(CONFIG_IPX) || defined(CONFIG_IPX_MODULE)
 #if defined(CONFIG_SPX) || defined(CONFIG_SPX_MODULE)
 #include <net/spx.h>
@@ -102,6 +107,7 @@
 struct unix_opt {
 	struct unix_address	*addr;
 	struct dentry *		dentry;
+	struct vfsmount *	mnt;
 	struct semaphore	readsem;
 	struct sock *		other;
 	struct sock **		list;
@@ -204,6 +210,28 @@
 };
 #endif
 
+#if defined(CONFIG_PPPOE) || defined (CONFIG_PPPOE_MODULE)
+struct pppoe_opt
+{
+	struct net_device      *dev;	  /* device associated with socket*/
+	struct pppoe_addr	pa;	  /* what this socket is bound to*/
+	struct sockaddr_pppox	relay;	  /* what socket data will be
+					     relayed to (PPPoE relaying) */
+};
+
+struct pppox_opt
+{
+	struct ppp_channel	chan;
+	struct sock		*sk;
+	struct pppox_opt	*next;	  /* for hash table */
+	union {
+		struct pppoe_opt pppoe;
+	} proto;
+};
+#define pppoe_dev	proto.pppoe.dev
+#define pppoe_pa	proto.pppoe.pa
+#define pppoe_relay	proto.pppoe.relay
+#endif
 
 /* This defines a selective acknowledgement block. */
 struct tcp_sack_block {
@@ -583,6 +611,9 @@
 #endif
 #if defined(CONFIG_ROSE) || defined(CONFIG_ROSE_MODULE)
 		rose_cb			*rose;
+#endif
+#if defined(CONFIG_PPPOE) || defined(CONFIG_PPPOE_MODULE)
+		struct pppox_opt	*pppox;
 #endif
 #ifdef CONFIG_NETLINK
 		struct netlink_opt	*af_netlink;