Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d83e177 authored Jan 19, 2014 by Peter Pan(潘卫平) Committed by David S. Miller Jan 21, 2014

tcp: delete redundant calls of tcp_mtup_init()



As tcp_rcv_state_process() has already calls tcp_mtup_init() for non-fastopen
sock, we can delete the redundant calls of tcp_mtup_init() in
tcp_{v4,v6}_syn_recv_sock().

Signed-off-by: Weiping Pan <panweiping3@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent f0d4eb29

net/ipv4/tcp_ipv4.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1668,7 +1668,6 @@ struct sock tcp_v4_syn_recv_sock(struct sock sk, struct sk_buff *skb,
	}		}
	sk_setup_caps(newsk, dst);		sk_setup_caps(newsk, dst);

	tcp_mtup_init(newsk);
	tcp_sync_mss(newsk, dst_mtu(dst));		tcp_sync_mss(newsk, dst_mtu(dst));
	newtp->advmss = dst_metric_advmss(dst);		newtp->advmss = dst_metric_advmss(dst);
	if (tcp_sk(sk)->rx_opt.user_mss &&		if (tcp_sk(sk)->rx_opt.user_mss &&

net/ipv6/tcp_ipv6.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1246,7 +1246,6 @@ static struct sock tcp_v6_syn_recv_sock(struct sock sk, struct sk_buff *skb,
	inet_csk(newsk)->icsk_ext_hdr_len = (newnp->opt->opt_nflen +		inet_csk(newsk)->icsk_ext_hdr_len = (newnp->opt->opt_nflen +
	newnp->opt->opt_flen);		newnp->opt->opt_flen);

	tcp_mtup_init(newsk);
	tcp_sync_mss(newsk, dst_mtu(dst));		tcp_sync_mss(newsk, dst_mtu(dst));
	newtp->advmss = dst_metric_advmss(dst);		newtp->advmss = dst_metric_advmss(dst);
	if (tcp_sk(sk)->rx_opt.user_mss &&		if (tcp_sk(sk)->rx_opt.user_mss &&