From f01ab21735580e067547a12ad10611de525f596f Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 30 Jul 2007 17:05:49 -0700
Subject: [PATCH] --- yaml --- r: 63407 b: refs/heads/master c:
 20283d84c7d922ca225b20db651d9a062716e8e3 h: refs/heads/master i:   63405:
 1f1214d28527ffbec3424e433c96f982b8668d67   63403:
 106299b7000293fd1217580adaba6604b4a57e2f   63399:
 d5719ff4f45af1dd87d6ab0e875504522118cc62   63391:
 f0a38c93f05898740d81140fc5a8f24e4a300733 v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/ipv6.h | 5 ++++-
 trunk/include/net/ipv6.h   | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a31f94ccf53f..26a0e3b467a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b217d616a15fcfb3caf2a72c1a071c6d3f182f8d
+refs/heads/master: 20283d84c7d922ca225b20db651d9a062716e8e3
diff --git a/trunk/include/linux/ipv6.h b/trunk/include/linux/ipv6.h
index 97983dc9df13..4ca60c3320fb 100644
--- a/trunk/include/linux/ipv6.h
+++ b/trunk/include/linux/ipv6.h
@@ -219,7 +219,6 @@ enum {
 #include <linux/tcp.h>
 #include <linux/udp.h>
 
-#include <net/if_inet6.h>       /* struct ipv6_mc_socklist */
 #include <net/inet_sock.h>
 
 static inline struct ipv6hdr *ipv6_hdr(const struct sk_buff *skb)
@@ -273,6 +272,10 @@ struct tcp6_request_sock {
 	struct inet6_request_sock tcp6rsk_inet6;
 };
 
+struct ipv6_mc_socklist;
+struct ipv6_ac_socklist;
+struct ipv6_fl_socklist;
+
 /**
  * struct ipv6_pinfo - ipv6 private area
  *
diff --git a/trunk/include/net/ipv6.h b/trunk/include/net/ipv6.h
index 46b9dce82f6e..9059e0ed7fe3 100644
--- a/trunk/include/net/ipv6.h
+++ b/trunk/include/net/ipv6.h
@@ -17,6 +17,7 @@
 
 #include <linux/ipv6.h>
 #include <linux/hardirq.h>
+#include <net/if_inet6.h>
 #include <net/ndisc.h>
 #include <net/flow.h>
 #include <net/snmp.h>