diff options
| author | Alexey Kodanev <alexey.kodanev@oracle.com> | 2017-03-09 13:53:55 +0300 | 
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-10 05:25:34 +0300 | 
| commit | a30aad50c26cac63026e5dfcc2e055ae63fe6ef7 (patch) | |
| tree | b805ec64727ce857ebde0ef9694bd50cca74ba1a /net/ipv4/tcp_ipv4.c | |
| parent | 9efd3831d5ae3babb45a37ae7d6b18642a0745de (diff) | |
| download | linux-a30aad50c26cac63026e5dfcc2e055ae63fe6ef7.tar.xz | |
tcp: rename *_sequence_number() to *_seq_and_tsoff()
The functions that are returning tcp sequence number also setup
TS offset value, so rename them to better describe their purpose.
No functional changes in this patch.
Suggested-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 22 | 
1 files changed, 11 insertions, 11 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 9a89b8deafae..7b332ed66488 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -94,12 +94,12 @@ static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,  struct inet_hashinfo tcp_hashinfo;  EXPORT_SYMBOL(tcp_hashinfo); -static u32 tcp_v4_init_sequence(const struct sk_buff *skb, u32 *tsoff) +static u32 tcp_v4_init_seq_and_tsoff(const struct sk_buff *skb, u32 *tsoff)  { -	return secure_tcp_sequence_number(ip_hdr(skb)->daddr, -					  ip_hdr(skb)->saddr, -					  tcp_hdr(skb)->dest, -					  tcp_hdr(skb)->source, tsoff); +	return secure_tcp_seq_and_tsoff(ip_hdr(skb)->daddr, +					ip_hdr(skb)->saddr, +					tcp_hdr(skb)->dest, +					tcp_hdr(skb)->source, tsoff);  }  int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp) @@ -236,11 +236,11 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)  	rt = NULL;  	if (likely(!tp->repair)) { -		seq = secure_tcp_sequence_number(inet->inet_saddr, -						 inet->inet_daddr, -						 inet->inet_sport, -						 usin->sin_port, -						 &tp->tsoffset); +		seq = secure_tcp_seq_and_tsoff(inet->inet_saddr, +					       inet->inet_daddr, +					       inet->inet_sport, +					       usin->sin_port, +					       &tp->tsoffset);  		if (!tp->write_seq)  			tp->write_seq = seq;  	} @@ -1249,7 +1249,7 @@ static const struct tcp_request_sock_ops tcp_request_sock_ipv4_ops = {  	.cookie_init_seq =	cookie_v4_init_sequence,  #endif  	.route_req	=	tcp_v4_route_req, -	.init_seq	=	tcp_v4_init_sequence, +	.init_seq_tsoff	=	tcp_v4_init_seq_and_tsoff,  	.send_synack	=	tcp_v4_send_synack,  };  | 
