diff options
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 60a5295a7de6..56f742fff967 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -101,12 +101,12 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb) | |||
101 | } | 101 | } |
102 | } | 102 | } |
103 | 103 | ||
104 | static u32 tcp_v6_init_sequence(const struct sk_buff *skb, u32 *tsoff) | 104 | static u32 tcp_v6_init_seq_and_tsoff(const struct sk_buff *skb, u32 *tsoff) |
105 | { | 105 | { |
106 | return secure_tcpv6_sequence_number(ipv6_hdr(skb)->daddr.s6_addr32, | 106 | return secure_tcpv6_seq_and_tsoff(ipv6_hdr(skb)->daddr.s6_addr32, |
107 | ipv6_hdr(skb)->saddr.s6_addr32, | 107 | ipv6_hdr(skb)->saddr.s6_addr32, |
108 | tcp_hdr(skb)->dest, | 108 | tcp_hdr(skb)->dest, |
109 | tcp_hdr(skb)->source, tsoff); | 109 | tcp_hdr(skb)->source, tsoff); |
110 | } | 110 | } |
111 | 111 | ||
112 | static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr, | 112 | static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr, |
@@ -287,11 +287,11 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr, | |||
287 | sk_set_txhash(sk); | 287 | sk_set_txhash(sk); |
288 | 288 | ||
289 | if (likely(!tp->repair)) { | 289 | if (likely(!tp->repair)) { |
290 | seq = secure_tcpv6_sequence_number(np->saddr.s6_addr32, | 290 | seq = secure_tcpv6_seq_and_tsoff(np->saddr.s6_addr32, |
291 | sk->sk_v6_daddr.s6_addr32, | 291 | sk->sk_v6_daddr.s6_addr32, |
292 | inet->inet_sport, | 292 | inet->inet_sport, |
293 | inet->inet_dport, | 293 | inet->inet_dport, |
294 | &tp->tsoffset); | 294 | &tp->tsoffset); |
295 | if (!tp->write_seq) | 295 | if (!tp->write_seq) |
296 | tp->write_seq = seq; | 296 | tp->write_seq = seq; |
297 | } | 297 | } |
@@ -755,7 +755,7 @@ static const struct tcp_request_sock_ops tcp_request_sock_ipv6_ops = { | |||
755 | .cookie_init_seq = cookie_v6_init_sequence, | 755 | .cookie_init_seq = cookie_v6_init_sequence, |
756 | #endif | 756 | #endif |
757 | .route_req = tcp_v6_route_req, | 757 | .route_req = tcp_v6_route_req, |
758 | .init_seq = tcp_v6_init_sequence, | 758 | .init_seq_tsoff = tcp_v6_init_seq_and_tsoff, |
759 | .send_synack = tcp_v6_send_synack, | 759 | .send_synack = tcp_v6_send_synack, |
760 | }; | 760 | }; |
761 | 761 | ||