Unverified Commit dd852536 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3427 tcp: Disable header prediction for MD5 flow. 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/FSAH52RS6L5EAK3KCTU75OII2G5ETW4Y/ 
 
https://gitee.com/openeuler/kernel/issues/I65HYE 
 
Link:https://gitee.com/openeuler/kernel/pulls/3427

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Acked-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parents 6d0b2553 3e8ef67b

net/ipv4/tcp_minisocks.c

+0 −2
Original line number Diff line number Diff line
@@ -541,8 +541,6 @@ struct sock *tcp_create_openreq_child(const struct sock *sk, 
	newtp->tsoffset = treq->ts_off;

#ifdef CONFIG_TCP_MD5SIG

	newtp->md5sig_info = NULL;	/*XXX*/

	if (treq->af_specific->req_md5_lookup(sk, req_to_sk(req)))

		newtp->tcp_header_len += TCPOLEN_MD5SIG_ALIGNED;

#endif

	if (skb->len >= TCP_MSS_DEFAULT + newtp->tcp_header_len)

		newicsk->icsk_ack.last_seg_size = skb->len - newtp->tcp_header_len;

net/ipv4/tcp_output.c

+0 −5
Original line number Diff line number Diff line
@@ -3717,11 +3717,6 @@ static void tcp_connect_init(struct sock *sk) 
	if (READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_timestamps))

		tp->tcp_header_len += TCPOLEN_TSTAMP_ALIGNED;



#ifdef CONFIG_TCP_MD5SIG

	if (tp->af_specific->md5_lookup(sk, sk))

		tp->tcp_header_len += TCPOLEN_MD5SIG_ALIGNED;

#endif



	/* If user gave his TCP_MAXSEG, record it to clamp */

	if (tp->rx_opt.user_mss)

		tp->rx_opt.mss_clamp = tp->rx_opt.user_mss;