Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=20283d84c7d922ca225b20db651d9a062716e8e3 Commit: 20283d84c7d922ca225b20db651d9a062716e8e3 Parent: b217d616a15fcfb3caf2a72c1a071c6d3f182f8d Author: Herbert Xu <[EMAIL PROTECTED]> AuthorDate: Mon Jul 30 17:05:49 2007 -0700 Committer: David S. Miller <[EMAIL PROTECTED]> CommitDate: Tue Jul 31 02:28:17 2007 -0700
[IPV6]: Remove circular dependency on if_inet6.h net/if_inet6.h includes linux/ipv6.h which also tries to include net/if_inet6.h. Since the latter only needs it for forward declarations, we can fix this by adding the declarations. A number of files are implicitly including net/if_inet6.h through linux/ipv6.h. They also use net/ipv6.h so this patch includes net/if_inet6.h there. Signed-off-by: Herbert Xu <[EMAIL PROTECTED]> Signed-off-by: David S. Miller <[EMAIL PROTECTED]> --- include/linux/ipv6.h | 5 ++++- include/net/ipv6.h | 1 + 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 97983dc..4ca60c3 100644 --- a/include/linux/ipv6.h +++ b/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/include/net/ipv6.h b/include/net/ipv6.h index 46b9dce..9059e0e 100644 --- a/include/net/ipv6.h +++ b/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> - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html