Re: [PATCH 2/2] udp_diag: Fix the !ipv6 case

From: Eric Dumazet <redacted>
Date: Sat, 10 Dec 2011 12:02:11 +0100

Le samedi 10 décembre 2011 à 13:35 +0400, Pavel Emelyanov a écrit :

quoted

Wrap the udp6 lookup into the proper ifdef-s.

Signed-off-by: Pavel Emelyanov <redacted>

---

diff --git a/net/ipv4/udp_diag.c b/net/ipv4/udp_diag.c
index 6506344..df7f960 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 defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)

strange space after second 'defined' ;)

By the way, we can now use :

#if IS_ENABLED(CONFIG_IPV6)

I applied this patch, changing it to use IS_ENABLED() along the way.

Thanks.