patch-2.1.20 linux/include/linux/ipv6.h

• Lines: 81
• Date: Thu Jan 2 15:36:46 1997
• Orig file: v2.1.19/linux/include/linux/ipv6.h
• Orig date: Tue Nov 12 15:56:14 1996

diff -u --recursive --new-file v2.1.19/linux/include/linux/ipv6.h linux/include/linux/ipv6.h
@@ -4,35 +4,6 @@
 #include <linux/in6.h>
 #include <asm/byteorder.h>
 
-/*
- *	IPv6 fixed header
- */
-
-struct ipv6hdr {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-	__u8			priority:4,
-				version:4;
-#elif defined(__BIG_ENDIAN_BITFIELD)
-	__u8			version:4,
-				priority:4;
-#else
-#error	"Please fix <asm/byteorder.h>"
-#endif						
-	__u8			flow_lbl[3];
-
-	__u16			payload_len;
-	__u8			nexthdr;
-	__u8			hop_limit;
-
-	struct	in6_addr	saddr;
-	struct	in6_addr	daddr;
-};
-
-struct in6_ifreq {
-	struct in6_addr	addr;
-	__u32		prefix_len;
-	char		devname[8]; 
-};
 
 /*
  *	Advanced API
@@ -46,6 +17,13 @@
 	int		ipi6_ifindex;
 };
 
+
+struct in6_ifreq {
+	struct in6_addr	ifr6_addr;
+	__u32		ifr6_prefixlen;
+	int		ifr6_ifindex; 
+};
+
 #define IPV6_SRCRT_STRICT	0x01	/* this hop must be a neighbor	*/
 #define IPV6_SRCRT_TYPE_0	0	/* IPv6 type 0 Routing Header	*/
 
@@ -77,6 +55,30 @@
 };
 
 #ifdef __KERNEL__
+
+/*
+ *	IPv6 fixed header
+ */
+
+struct ipv6hdr {
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+	__u8			priority:4,
+				version:4;
+#elif defined(__BIG_ENDIAN_BITFIELD)
+	__u8			version:4,
+				priority:4;
+#else
+#error	"Please fix <asm/byteorder.h>"
+#endif						
+	__u8			flow_lbl[3];
+
+	__u16			payload_len;
+	__u8			nexthdr;
+	__u8			hop_limit;
+
+	struct	in6_addr	saddr;
+	struct	in6_addr	daddr;
+};
 
 /*
  *	The length of this struct cannot be greater than the length of