aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/tcp.h3
-rw-r--r--net/ipv4/tcp_fastopen.c6
-rw-r--r--net/ipv4/tcp_input.c2
3 files changed, 4 insertions, 7 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h
index afdab3781425..a995004ae946 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1533,8 +1533,7 @@ int tcp_fastopen_reset_cipher(void *key, unsigned int len);
1533void tcp_fastopen_add_skb(struct sock *sk, struct sk_buff *skb); 1533void tcp_fastopen_add_skb(struct sock *sk, struct sk_buff *skb);
1534struct sock *tcp_try_fastopen(struct sock *sk, struct sk_buff *skb, 1534struct sock *tcp_try_fastopen(struct sock *sk, struct sk_buff *skb,
1535 struct request_sock *req, 1535 struct request_sock *req,
1536 struct tcp_fastopen_cookie *foc, 1536 struct tcp_fastopen_cookie *foc);
1537 struct dst_entry *dst);
1538void tcp_fastopen_init_key_once(bool publish); 1537void tcp_fastopen_init_key_once(bool publish);
1539bool tcp_fastopen_cookie_check(struct sock *sk, u16 *mss, 1538bool tcp_fastopen_cookie_check(struct sock *sk, u16 *mss,
1540 struct tcp_fastopen_cookie *cookie); 1539 struct tcp_fastopen_cookie *cookie);
diff --git a/net/ipv4/tcp_fastopen.c b/net/ipv4/tcp_fastopen.c
index ce9c7fef200f..e3c33220c418 100644
--- a/net/ipv4/tcp_fastopen.c
+++ b/net/ipv4/tcp_fastopen.c
@@ -171,7 +171,6 @@ void tcp_fastopen_add_skb(struct sock *sk, struct sk_buff *skb)
171 171
172static struct sock *tcp_fastopen_create_child(struct sock *sk, 172static struct sock *tcp_fastopen_create_child(struct sock *sk,
173 struct sk_buff *skb, 173 struct sk_buff *skb,
174 struct dst_entry *dst,
175 struct request_sock *req) 174 struct request_sock *req)
176{ 175{
177 struct tcp_sock *tp; 176 struct tcp_sock *tp;
@@ -278,8 +277,7 @@ static bool tcp_fastopen_queue_check(struct sock *sk)
278 */ 277 */
279struct sock *tcp_try_fastopen(struct sock *sk, struct sk_buff *skb, 278struct sock *tcp_try_fastopen(struct sock *sk, struct sk_buff *skb,
280 struct request_sock *req, 279 struct request_sock *req,
281 struct tcp_fastopen_cookie *foc, 280 struct tcp_fastopen_cookie *foc)
282 struct dst_entry *dst)
283{ 281{
284 struct tcp_fastopen_cookie valid_foc = { .len = -1 }; 282 struct tcp_fastopen_cookie valid_foc = { .len = -1 };
285 bool syn_data = TCP_SKB_CB(skb)->end_seq != TCP_SKB_CB(skb)->seq + 1; 283 bool syn_data = TCP_SKB_CB(skb)->end_seq != TCP_SKB_CB(skb)->seq + 1;
@@ -312,7 +310,7 @@ struct sock *tcp_try_fastopen(struct sock *sk, struct sk_buff *skb,
312 * data in SYN_RECV state. 310 * data in SYN_RECV state.
313 */ 311 */
314fastopen: 312fastopen:
315 child = tcp_fastopen_create_child(sk, skb, dst, req); 313 child = tcp_fastopen_create_child(sk, skb, req);
316 if (child) { 314 if (child) {
317 foc->len = -1; 315 foc->len = -1;
318 NET_INC_STATS(sock_net(sk), 316 NET_INC_STATS(sock_net(sk),
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index ab908949ee95..d3421ee9a10a 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -6150,7 +6150,7 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops,
6150 tcp_openreq_init_rwin(req, sk, dst); 6150 tcp_openreq_init_rwin(req, sk, dst);
6151 if (!want_cookie) { 6151 if (!want_cookie) {
6152 tcp_reqsk_record_syn(sk, req, skb); 6152 tcp_reqsk_record_syn(sk, req, skb);
6153 fastopen_sk = tcp_try_fastopen(sk, skb, req, &foc, dst); 6153 fastopen_sk = tcp_try_fastopen(sk, skb, req, &foc);
6154 } 6154 }
6155 if (fastopen_sk) { 6155 if (fastopen_sk) {
6156 af_ops->send_synack(fastopen_sk, dst, &fl, req, 6156 af_ops->send_synack(fastopen_sk, dst, &fl, req,