Commit 0e8642cf authored Jul 31, 2020 by Eric Dumazet Committed by David S. Miller Aug 01, 2020

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: 9466a1cc ("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>

parent 6f3de75c

net/ipv4/syncookies.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -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

Admin message