aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_ipv4.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
-rw-r--r--net/ipv4/tcp_ipv4.c22
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,
94struct inet_hashinfo tcp_hashinfo; 94struct inet_hashinfo tcp_hashinfo;
95EXPORT_SYMBOL(tcp_hashinfo); 95EXPORT_SYMBOL(tcp_hashinfo);
96 96
97static u32 tcp_v4_init_sequence(const struct sk_buff *skb, u32 *tsoff) 97static u32 tcp_v4_init_seq_and_tsoff(const struct sk_buff *skb, u32 *tsoff)
98{ 98{
99 return secure_tcp_sequence_number(ip_hdr(skb)->daddr, 99 return secure_tcp_seq_and_tsoff(ip_hdr(skb)->daddr,
100 ip_hdr(skb)->saddr, 100 ip_hdr(skb)->saddr,
101 tcp_hdr(skb)->dest, 101 tcp_hdr(skb)->dest,
102 tcp_hdr(skb)->source, tsoff); 102 tcp_hdr(skb)->source, tsoff);
103} 103}
104 104
105int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp) 105int 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)
236 rt = NULL; 236 rt = NULL;
237 237
238 if (likely(!tp->repair)) { 238 if (likely(!tp->repair)) {
239 seq = secure_tcp_sequence_number(inet->inet_saddr, 239 seq = secure_tcp_seq_and_tsoff(inet->inet_saddr,
240 inet->inet_daddr, 240 inet->inet_daddr,
241 inet->inet_sport, 241 inet->inet_sport,
242 usin->sin_port, 242 usin->sin_port,
243 &tp->tsoffset); 243 &tp->tsoffset);
244 if (!tp->write_seq) 244 if (!tp->write_seq)
245 tp->write_seq = seq; 245 tp->write_seq = seq;
246 } 246 }
@@ -1249,7 +1249,7 @@ static const struct tcp_request_sock_ops tcp_request_sock_ipv4_ops = {
1249 .cookie_init_seq = cookie_v4_init_sequence, 1249 .cookie_init_seq = cookie_v4_init_sequence,
1250#endif 1250#endif
1251 .route_req = tcp_v4_route_req, 1251 .route_req = tcp_v4_route_req,
1252 .init_seq = tcp_v4_init_sequence, 1252 .init_seq_tsoff = tcp_v4_init_seq_and_tsoff,
1253 .send_synack = tcp_v4_send_synack, 1253 .send_synack = tcp_v4_send_synack,
1254}; 1254};
1255 1255