ipv6: adapt connect for repair move
This is work the same as for ipv4. All other hacks about tcp repair are in common code for ipv4 and ipv6, so this patch is enough for repairing ipv6 connections. Cc: "David S. Miller" <davem@davemloft.net> Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> Cc: James Morris <jmorris@namei.org> Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> Cc: Patrick McHardy <kaber@trash.net> Cc: Pavel Emelyanov <xemul@parallels.com> Signed-off-by: Andrey Vagin <avagin@openvz.org> Acked-by: Pavel Emelyanov <xemul@parallels.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
242a18d137
commit
2b9164771e
|
@ -138,14 +138,6 @@ int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(tcp_twsk_unique);
|
||||
|
||||
static int tcp_repair_connect(struct sock *sk)
|
||||
{
|
||||
tcp_connect_init(sk);
|
||||
tcp_finish_connect(sk, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* This will initiate an outgoing connection. */
|
||||
int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
||||
{
|
||||
|
@ -250,10 +242,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
|||
|
||||
inet->inet_id = tp->write_seq ^ jiffies;
|
||||
|
||||
if (likely(!tp->repair))
|
||||
err = tcp_connect(sk);
|
||||
else
|
||||
err = tcp_repair_connect(sk);
|
||||
err = tcp_connect(sk);
|
||||
|
||||
rt = NULL;
|
||||
if (err)
|
||||
|
|
|
@ -2987,6 +2987,11 @@ int tcp_connect(struct sock *sk)
|
|||
|
||||
tcp_connect_init(sk);
|
||||
|
||||
if (unlikely(tp->repair)) {
|
||||
tcp_finish_connect(sk, NULL);
|
||||
return 0;
|
||||
}
|
||||
|
||||
buff = alloc_skb_fclone(MAX_TCP_HEADER + 15, sk->sk_allocation);
|
||||
if (unlikely(buff == NULL))
|
||||
return -ENOBUFS;
|
||||
|
|
|
@ -295,7 +295,7 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
|
|||
if (err)
|
||||
goto late_failure;
|
||||
|
||||
if (!tp->write_seq)
|
||||
if (!tp->write_seq && likely(!tp->repair))
|
||||
tp->write_seq = secure_tcpv6_sequence_number(np->saddr.s6_addr32,
|
||||
np->daddr.s6_addr32,
|
||||
inet->inet_sport,
|
||||
|
|
Loading…
Reference in a new issue