---

yaml --- r: 335853 b: refs/heads/master c: b4dd006 h: refs/heads/master i: 335851: 107fbdd v: v3
git-mirror · Nov 20, 2012 · e673886 · e673886
1 parent d747667
commit e673886
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e2f61cd7a4e7642dcac4371734426e572f10370
+refs/heads/master: b4dd006760d671337b62532277b0296bcee8dfd4
diff --git a/trunk/net/ipv6/inet6_connection_sock.c b/trunk/net/ipv6/inet6_connection_sock.c
@@ -252,6 +252,7 @@ struct dst_entry *inet6_csk_update_pmtu(struct sock *sk, u32 mtu)
 		return NULL;
 	dst->ops->update_pmtu(dst, sk, NULL, mtu);
 
-	return inet6_csk_route_socket(sk, &fl6);
+	dst = inet6_csk_route_socket(sk, &fl6);
+	return IS_ERR(dst) ? NULL : dst;
 }
 EXPORT_SYMBOL_GPL(inet6_csk_update_pmtu);