From 75afb60e431bc13dd829041040bb1ae34bd9d66e Mon Sep 17 00:00:00 2001
From: Hannes Frederic Sowa <hannes@stressinduktion.org>
Date: Sat, 10 Nov 2012 19:52:34 +0000
Subject: [PATCH] --- yaml --- r: 335747 b: refs/heads/master c:
 d4596bad2a713fcd0def492b1960e6d899d5baa8 h: refs/heads/master i:   335745:
 c02a2bcdf7d4fddb3e40cf0eac04dafecde9aa14   335743:
 953cdb39bffb49ffd16b858647acd15c601e8163 v: v3

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

diff --git a/[refs] b/[refs]
index 82c8666eb4cf..992ecbac1db5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73e212fc48890b552e4ae65b65c0e709f478879b
+refs/heads/master: d4596bad2a713fcd0def492b1960e6d899d5baa8
diff --git a/trunk/net/ipv6/ipv6_sockglue.c b/trunk/net/ipv6/ipv6_sockglue.c
index ba6d13d1f1e1..e02faed6d17e 100644
--- a/trunk/net/ipv6/ipv6_sockglue.c
+++ b/trunk/net/ipv6/ipv6_sockglue.c
@@ -827,6 +827,7 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
 		if (val < 0 || val > 255)
 			goto e_inval;
 		np->min_hopcount = val;
+		retv = 0;
 		break;
 	case IPV6_DONTFRAG:
 		np->dontfrag = valbool;