---

yaml --- r: 322749 b: refs/heads/master c: d013ef2 h: refs/heads/master i: 322747: 914b595 v: v3
git-mirror · Sep 5, 2012 · a9edd88 · a9edd88
1 parent 9d4102e
commit a9edd88
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 463dde19a759949c96d1c9da9efbb3a9b3a9eb61
+refs/heads/master: d013ef2aba8fe765ca683598e404203215632373
diff --git a/trunk/net/ipv6/tcp_ipv6.c b/trunk/net/ipv6/tcp_ipv6.c
@@ -403,8 +403,9 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 		tp->mtu_info = ntohl(info);
 		if (!sock_owned_by_user(sk))
 			tcp_v6_mtu_reduced(sk);
-		else
-			set_bit(TCP_MTU_REDUCED_DEFERRED, &tp->tsq_flags);
+		else if (!test_and_set_bit(TCP_MTU_REDUCED_DEFERRED,
+					   &tp->tsq_flags))
+			sock_hold(sk);
 		goto out;
 	}