diff options
| author | Pavel Emelyanov <xemul@parallels.com> | 2012-04-19 03:40:01 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-21 15:52:25 -0400 |
| commit | 370816aef0c5436c2adbec3966038f36ca326933 (patch) | |
| tree | 665f8b3b0818aa7aa4f653072d89d1dcfb91a55f /net/ipv4/tcp_output.c | |
| parent | 4a17fd5229c1b6066aa478f6b690f8293ce811a1 (diff) | |
| download | linux-3.10-370816aef0c5436c2adbec3966038f36ca326933.tar.gz linux-3.10-370816aef0c5436c2adbec3966038f36ca326933.tar.bz2 linux-3.10-370816aef0c5436c2adbec3966038f36ca326933.zip | |
tcp: Move code around
This is just the preparation patch, which makes the needed for
TCP repair code ready for use.
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index de8790ced94..db126a6954a 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -2561,7 +2561,7 @@ struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst, EXPORT_SYMBOL(tcp_make_synack); /* Do all connect socket setups that can be done AF independent. */ -static void tcp_connect_init(struct sock *sk) +void tcp_connect_init(struct sock *sk) { const struct dst_entry *dst = __sk_dst_get(sk); struct tcp_sock *tp = tcp_sk(sk); @@ -2616,6 +2616,7 @@ static void tcp_connect_init(struct sock *sk) tp->snd_una = tp->write_seq; tp->snd_sml = tp->write_seq; tp->snd_up = tp->write_seq; + tp->snd_nxt = tp->write_seq; tp->rcv_nxt = 0; tp->rcv_wup = 0; tp->copied_seq = 0; @@ -2641,7 +2642,6 @@ int tcp_connect(struct sock *sk) /* Reserve space for headers. */ skb_reserve(buff, MAX_TCP_HEADER); - tp->snd_nxt = tp->write_seq; tcp_init_nondata_skb(buff, tp->write_seq++, TCPHDR_SYN); TCP_ECN_send_syn(sk, buff); |