]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
tcp: tcp_conn_request: fix build error when IPv6 is disabled
authorOctavian Purdila <octavian.purdila@intel.com>
Sat, 28 Jun 2014 18:20:54 +0000 (21:20 +0300)
committerDavid S. Miller <davem@davemloft.net>
Mon, 30 Jun 2014 06:46:38 +0000 (23:46 -0700)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/tcp_input.c

index 97e48d60c4e8ac39dacf17ce226c2f9beebf047a..bb684967f7a77e5f727d2150fe798d7228ca6a16 100644 (file)
@@ -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,