---

yaml --- r: 278554 b: refs/heads/master c: 86e62ad h: refs/heads/master v: v3
git-mirror · Dec 10, 2011 · 266ec49 · 266ec49
1 parent 141f564
commit 266ec49
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b872a2371ffd13e6d83423ef621a707df4c158ac
+refs/heads/master: 86e62ad6b2a49064a078d7f22fa81afdaecc1187
diff --git a/trunk/net/ipv4/udp_diag.c b/trunk/net/ipv4/udp_diag.c
@@ -41,13 +41,15 @@ static int udp_dump_one(struct udp_table *tbl, struct sk_buff *in_skb,
 				req->id.idiag_src[0], req->id.idiag_sport,
 				req->id.idiag_dst[0], req->id.idiag_dport,
 				req->id.idiag_if, tbl);
+#if IS_ENABLED(CONFIG_IPV6)
 	else if (req->sdiag_family == AF_INET6)
 		sk = __udp6_lib_lookup(&init_net,
 				(struct in6_addr *)req->id.idiag_src,
 				req->id.idiag_sport,
 				(struct in6_addr *)req->id.idiag_dst,
 				req->id.idiag_dport,
 				req->id.idiag_if, tbl);
+#endif
 	else
 		goto out_nosk;