From bceb5617736a20c35ecfbf531496d2c21ebaa039 Mon Sep 17 00:00:00 2001
From: Li Wei <lw@cn.fujitsu.com>
Date: Sun, 27 Nov 2011 21:33:34 +0000
Subject: [PATCH] --- yaml --- r: 276243 b: refs/heads/master c:
 2a38e6d5aed24bb7f0211e0819fac8c32c2b5791 h: refs/heads/master i:   276241:
 304b4ff910d9f72122526f55ee5585f0e0fa3d55   276239:
 613eca06ee95f4a65edf34dc3b156bcfcc3088a1 v: v3

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

diff --git a/[refs] b/[refs]
index 82f760e17b75..87c7c3b4ff9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5cac98dd06bc43a7baab3523184f70fd359e9f35
+refs/heads/master: 2a38e6d5aed24bb7f0211e0819fac8c32c2b5791
diff --git a/trunk/net/ipv6/ipv6_sockglue.c b/trunk/net/ipv6/ipv6_sockglue.c
index c99e3ee9781f..26cb08c84b74 100644
--- a/trunk/net/ipv6/ipv6_sockglue.c
+++ b/trunk/net/ipv6/ipv6_sockglue.c
@@ -503,7 +503,7 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
 			goto e_inval;
 		if (val > 255 || val < -1)
 			goto e_inval;
-		np->mcast_hops = val;
+		np->mcast_hops = (val == -1 ? IPV6_DEFAULT_MCASTHOPS : val);
 		retv = 0;
 		break;