diff options
author | Octavian Purdila <octavian.purdila@intel.com> | 2014-06-28 21:20:54 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-06-29 23:46:38 -0700 |
commit | 4135ab8208048a1586385fae1298726d7dacfc26 (patch) | |
tree | 742437711ba18086d42d3933b886dd9b23e73e57 /net | |
parent | 9e1a21b69394b677bd9b144bb638f6c660f77ed2 (diff) | |
download | op-kernel-dev-4135ab8208048a1586385fae1298726d7dacfc26.zip op-kernel-dev-4135ab8208048a1586385fae1298726d7dacfc26.tar.gz |
tcp: tcp_conn_request: fix build error when IPv6 is disabled
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>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/tcp_input.c | 4 |
1 files changed, 3 insertions, 1 deletions
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, |