From c7fc24dc4420057f103afe8fc64524ebc25c5d37 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 25 Aug 1998 09:12:35 +0000
Subject:  o Merge with Linux 2.1.116.  o New Newport console code.  o New G364
 console code.

---
 include/net/ipv6.h | 40 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)

(limited to 'include/net/ipv6.h')

diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index c3d2d5895..acf37b357 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -4,7 +4,7 @@
  *	Authors:
  *	Pedro Roque		<roque@di.fc.ul.pt>
  *
- *	$Id: ipv6.h,v 1.10 1998/04/30 16:24:14 freitag Exp $
+ *	$Id: ipv6.h,v 1.12 1998/07/15 05:05:02 davem Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -118,6 +118,31 @@ struct frag_queue {
 	__u8			*nhptr;
 };
 
+struct ipv6_tlvtype
+{
+	u8 type;
+	u8 len;
+};
+
+struct ip6_ra_chain
+{
+	struct ip6_ra_chain	*next;
+	struct sock		*sk;
+	int			sel;
+	void			(*destructor)(struct sock *);
+};
+
+extern struct ip6_ra_chain	*ip6_ra_chain;
+
+extern int 			ip6_ra_control(struct sock *sk, int sel,
+					       void (*destructor)(struct sock *));
+
+
+extern int			ip6_call_ra_chain(struct sk_buff *skb, int sel);
+
+extern int 			ip6_dstopt_unknown(struct sk_buff *skb,
+						   struct ipv6_tlvtype *hdr);
+
 extern int			ipv6_routing_header(struct sk_buff **skb, 
 						    struct device *dev,
 						    __u8 *nhptr, 
@@ -266,11 +291,16 @@ extern int			ipv6_getsockopt(struct sock *sk, int level,
 						int optname, char *optval, 
 						int *optlen);
 
+extern void			ipv6_packet_init(void);
 
-extern void			ipv6_init(void);
-extern void			ipv6_cleanup(void);
-#endif
-#endif
+extern void			ipv6_netdev_notif_init(void);
+
+extern void			ipv6_packet_cleanup(void);
+
+extern void			ipv6_netdev_notif_cleanup(void);
+
+#endif /* __KERNEL__ */
+#endif /* _NET_IPV6_H */
 
 
 
-- 
cgit v1.2.3