From: Pavel Emelyanov <xemul@parallels.com>
Date: Fri, 9 Dec 2011 23:35:07 +0000 (+0000)
Subject: udp_diag: Fix the !ipv6 case
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=86e62ad6b2a49064a078d7f22fa81afdaecc1187;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

udp_diag: Fix the !ipv6 case

Wrap the udp6 lookup into the proper ifdef-s.

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/udp_diag.c b/net/ipv4/udp_diag.c
index 65063444a119..27910c133019 100644
--- a/net/ipv4/udp_diag.c
+++ b/net/ipv4/udp_diag.c
@@ -41,6 +41,7 @@ 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,
@@ -48,6 +49,7 @@ static int udp_dump_one(struct udp_table *tbl, struct sk_buff *in_skb,
 				(struct in6_addr *)req->id.idiag_dst,
 				req->id.idiag_dport,
 				req->id.idiag_if, tbl);
+#endif
 	else
 		goto out_nosk;