[PATCH net-next] tcp: tcp_conn_request: fix build error when IPv6 is disabled

[PATCH net-next] tcp: tcp_conn_request: fix build error when IPv6 is disabled

[Octavian Purdila]

Fixes build error introduced by commit 1fb6f159fd21c64 (tcp: add
tcp_conn_request):

net/ipv4/tcp_input.c: In function 'pr_drop_req':
net/ipv4/tcp_input.c:5889:130: error: 'struct sock_common' has no member named 'skc_v6_daddr'

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Octavian Purdila <octavian.purdila@intel.com>
---
 net/ipv4/tcp_input.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 97e48d6..bb68496 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -5885,9 +5885,11 @@ static inline void pr_drop_req(struct request_sock *req, __u16 port, int family)
 	if (family == AF_INET)
 		LIMIT_NETDEBUG(KERN_DEBUG pr_fmt("drop open request from %pI4/%u\n"),
 			       &ireq->ir_rmt_addr, port);
-	else
+#if IS_ENABLED(CONFIG_IPV6)
+	else if (family == AF_INET6)
 		LIMIT_NETDEBUG(KERN_DEBUG pr_fmt("drop open request from %pI6/%u\n"),
 			       &ireq->ir_v6_rmt_addr, port);
+#endif
 }
 
 int tcp_conn_request(struct request_sock_ops *rsk_ops,
-- 
1.8.3.2

Re: [PATCH net-next] tcp: tcp_conn_request: fix build error when IPv6 is disabled

[David Miller]

From: Octavian Purdila <octavian.purdila@intel.com>
Date: Sat, 28 Jun 2014 21:20:54 +0300

> Fixes build error introduced by commit 1fb6f159fd21c64 (tcp: add
> tcp_conn_request):
> 
> net/ipv4/tcp_input.c: In function 'pr_drop_req':
> net/ipv4/tcp_input.c:5889:130: error: 'struct sock_common' has no member named 'skc_v6_daddr'
> 
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Signed-off-by: Octavian Purdila <octavian.purdila@intel.com>

Applied, thanks.