aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_output.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@parallels.com>2012-04-18 23:40:01 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-21 15:52:25 -0400
commit370816aef0c5436c2adbec3966038f36ca326933 (patch)
tree665f8b3b0818aa7aa4f653072d89d1dcfb91a55f /net/ipv4/tcp_output.c
parent4a17fd5229c1b6066aa478f6b690f8293ce811a1 (diff)
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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index de8790ced946..db126a6954a2 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,
2561EXPORT_SYMBOL(tcp_make_synack); 2561EXPORT_SYMBOL(tcp_make_synack);
2562 2562
2563/* Do all connect socket setups that can be done AF independent. */ 2563/* Do all connect socket setups that can be done AF independent. */
2564static void tcp_connect_init(struct sock *sk) 2564void tcp_connect_init(struct sock *sk)
2565{ 2565{
2566 const struct dst_entry *dst = __sk_dst_get(sk); 2566 const struct dst_entry *dst = __sk_dst_get(sk);
2567 struct tcp_sock *tp = tcp_sk(sk); 2567 struct tcp_sock *tp = tcp_sk(sk);
@@ -2616,6 +2616,7 @@ static void tcp_connect_init(struct sock *sk)
2616 tp->snd_una = tp->write_seq; 2616 tp->snd_una = tp->write_seq;
2617 tp->snd_sml = tp->write_seq; 2617 tp->snd_sml = tp->write_seq;
2618 tp->snd_up = tp->write_seq; 2618 tp->snd_up = tp->write_seq;
2619 tp->snd_nxt = tp->write_seq;
2619 tp->rcv_nxt = 0; 2620 tp->rcv_nxt = 0;
2620 tp->rcv_wup = 0; 2621 tp->rcv_wup = 0;
2621 tp->copied_seq = 0; 2622 tp->copied_seq = 0;
@@ -2641,7 +2642,6 @@ int tcp_connect(struct sock *sk)
2641 /* Reserve space for headers. */ 2642 /* Reserve space for headers. */
2642 skb_reserve(buff, MAX_TCP_HEADER); 2643 skb_reserve(buff, MAX_TCP_HEADER);
2643 2644
2644 tp->snd_nxt = tp->write_seq;
2645 tcp_init_nondata_skb(buff, tp->write_seq++, TCPHDR_SYN); 2645 tcp_init_nondata_skb(buff, tp->write_seq++, TCPHDR_SYN);
2646 TCP_ECN_send_syn(sk, buff); 2646 TCP_ECN_send_syn(sk, buff);
2647 2647