projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b872a23
)
udp_diag: Fix the !ipv6 case
author
Pavel Emelyanov
<
[email protected]
>
Fri, 9 Dec 2011 23:35:07 +0000
(23:35 +0000)
committer
David S. Miller
<
[email protected]
>
Sat, 10 Dec 2011 18:14:59 +0000
(13:14 -0500)
Wrap the udp6 lookup into the proper ifdef-s.
Signed-off-by: Pavel Emelyanov <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
net/ipv4/udp_diag.c
patch
|
blob
|
history
diff --git
a/net/ipv4/udp_diag.c
b/net/ipv4/udp_diag.c
index 65063444a119b87b4c32d3eb6b5bd5247b270f2f..27910c133019b35bb5397222b6612df4d5164b63 100644
(file)
--- 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;