aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_output.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2005-07-05 18:18:18 -0400
committerDavid S. Miller <davem@davemloft.net>2005-07-05 18:18:18 -0400
commit84d3e7b9573291a1ea845bdd51b74bb484597661 (patch)
treec0bd2b1721b09a21e9d44e92e2532dc79373844f /net/ipv4/tcp_output.c
parentf6302d1d78f77c2d4c8bd32b0afc2df7fdf5f281 (diff)
[TCP]: Move __tcp_data_snd_check into tcp_output.c
It reimplements portions of tcp_snd_check(), so it we move it to tcp_output.c we can consolidate it's logic much easier in a later change. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_output.c')
-rw-r--r--net/ipv4/tcp_output.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 2cbe879ee16a..362b811a2460 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -530,6 +530,16 @@ void __tcp_push_pending_frames(struct sock *sk, struct tcp_sock *tp,
530 tcp_cwnd_validate(sk, tp); 530 tcp_cwnd_validate(sk, tp);
531} 531}
532 532
533void __tcp_data_snd_check(struct sock *sk, struct sk_buff *skb)
534{
535 struct tcp_sock *tp = tcp_sk(sk);
536
537 if (after(TCP_SKB_CB(skb)->end_seq, tp->snd_una + tp->snd_wnd) ||
538 tcp_packets_in_flight(tp) >= tp->snd_cwnd ||
539 tcp_write_xmit(sk, tp->nonagle))
540 tcp_check_probe_timer(sk, tp);
541}
542
533int tcp_may_send_now(struct sock *sk, struct tcp_sock *tp) 543int tcp_may_send_now(struct sock *sk, struct tcp_sock *tp)
534{ 544{
535 struct sk_buff *skb = sk->sk_send_head; 545 struct sk_buff *skb = sk->sk_send_head;