summaryrefslogtreecommitdiff
path: root/net/ipv4
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2020-08-01 05:09:29 +0300
committerDavid S. Miller <davem@davemloft.net>2020-08-01 21:46:29 +0300
commit0e8642cf369a37b718c15effa6ffd52c00fd7d15 (patch)
tree39ffb14de42e61e9f9354e3624c6c1136b5d32ba /net/ipv4
parent6f3de75cdf60c1b859bc8c1904d25889c00d7bbe (diff)
downloadlinux-0e8642cf369a37b718c15effa6ffd52c00fd7d15.tar.xz
tcp: fix build fong CONFIG_MPTCP=n
Fixes these errors: net/ipv4/syncookies.c: In function 'tcp_get_cookie_sock': net/ipv4/syncookies.c:216:19: error: 'struct tcp_request_sock' has no member named 'drop_req' 216 | if (tcp_rsk(req)->drop_req) { | ^~ net/ipv4/syncookies.c: In function 'cookie_tcp_reqsk_alloc': net/ipv4/syncookies.c:289:27: warning: unused variable 'treq' [-Wunused-variable] 289 | struct tcp_request_sock *treq; | ^~~~ make[3]: *** [scripts/Makefile.build:280: net/ipv4/syncookies.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Fixes: 9466a1ccebbe ("mptcp: enable JOIN requests even if cookies are in use") Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Florian Westphal <fw@strlen.de> Acked-by: Florian Westphal <fw@strlen.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/syncookies.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c
index 11b20474be83..f0794f0232ba 100644
--- a/net/ipv4/syncookies.c
+++ b/net/ipv4/syncookies.c
@@ -213,7 +213,7 @@ struct sock *tcp_get_cookie_sock(struct sock *sk, struct sk_buff *skb,
tcp_sk(child)->tsoffset = tsoff;
sock_rps_save_rxhash(child, skb);
- if (tcp_rsk(req)->drop_req) {
+ if (rsk_drop_req(req)) {
refcount_set(&req->rsk_refcnt, 2);
return child;
}
@@ -286,10 +286,11 @@ struct request_sock *cookie_tcp_reqsk_alloc(const struct request_sock_ops *ops,
struct sock *sk,
struct sk_buff *skb)
{
- struct tcp_request_sock *treq;
struct request_sock *req;
#ifdef CONFIG_MPTCP
+ struct tcp_request_sock *treq;
+
if (sk_is_mptcp(sk))
ops = &mptcp_subflow_request_sock_ops;
#endif