From 718750f7f6bdcfd191f5fe90abc9361c73a3bfde Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 3 May 2010 23:42:27 -0700
Subject: [PATCH] --- yaml --- r: 190614 b: refs/heads/master c:
 f935aa9e99d6ec74a50871c120e6b21de7256efb h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv6/af_inet6.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0d8394b91fd0..29be69e44866 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1827d2e943eeb5cba0662f3e6edc342d6bd65ae6
+refs/heads/master: f935aa9e99d6ec74a50871c120e6b21de7256efb
diff --git a/trunk/net/ipv6/af_inet6.c b/trunk/net/ipv6/af_inet6.c
index 3192aa02ba5d..3f9e86b15e0d 100644
--- a/trunk/net/ipv6/af_inet6.c
+++ b/trunk/net/ipv6/af_inet6.c
@@ -200,7 +200,7 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol,
 
 	inet_sk(sk)->pinet6 = np = inet6_sk_generic(sk);
 	np->hop_limit	= -1;
-	np->mcast_hops	= -1;
+	np->mcast_hops	= IPV6_DEFAULT_MCASTHOPS;
 	np->mc_loop	= 1;
 	np->pmtudisc	= IPV6_PMTUDISC_WANT;
 	np->ipv6only	= net->ipv6.sysctl.bindv6only;