From 266ec499f40445b1e7e95c35f4893eda3b7feb95 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Fri, 9 Dec 2011 23:35:07 +0000 Subject: [PATCH] --- yaml --- r: 278554 b: refs/heads/master c: 86e62ad6b2a49064a078d7f22fa81afdaecc1187 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/udp_diag.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7351c567cc1c..24a73558f61c 100644 --- 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 index 65063444a119..27910c133019 100644 --- a/trunk/net/ipv4/udp_diag.c +++ b/trunk/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;