diff options
author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2007-08-25 01:44:06 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:48:28 -0400 |
commit | 6ff03ac355cc6c10f7b1f44dd466d41213acebca (patch) | |
tree | 9057f7839df5bc65ea73148eee4148114f6f45c9 | |
parent | e9144bd8da80f3136b23c615609798e371e885ac (diff) |
[TCP]: tcp_packets_out_inc to tcp_output.c (no callers elsewhere)
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/tcp.h | 12 | ||||
-rw-r--r-- | net/ipv4/tcp_output.c | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 66827177ae8b..4ba256a3f5e0 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
@@ -614,18 +614,6 @@ static inline void tcp_dec_pcount_approx(__u32 *count, | |||
614 | tcp_dec_pcount_approx_int(count, tcp_skb_pcount(skb)); | 614 | tcp_dec_pcount_approx_int(count, tcp_skb_pcount(skb)); |
615 | } | 615 | } |
616 | 616 | ||
617 | static inline void tcp_packets_out_inc(struct sock *sk, | ||
618 | const struct sk_buff *skb) | ||
619 | { | ||
620 | struct tcp_sock *tp = tcp_sk(sk); | ||
621 | int orig = tp->packets_out; | ||
622 | |||
623 | tp->packets_out += tcp_skb_pcount(skb); | ||
624 | if (!orig) | ||
625 | inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS, | ||
626 | inet_csk(sk)->icsk_rto, TCP_RTO_MAX); | ||
627 | } | ||
628 | |||
629 | /* Events passed to congestion control interface */ | 617 | /* Events passed to congestion control interface */ |
630 | enum tcp_ca_event { | 618 | enum tcp_ca_event { |
631 | CA_EVENT_TX_START, /* first transmit when no packets in flight */ | 619 | CA_EVENT_TX_START, /* first transmit when no packets in flight */ |
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 1d65ce1b68d7..a61a3e3082ae 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -61,6 +61,18 @@ int sysctl_tcp_base_mss __read_mostly = 512; | |||
61 | /* By default, RFC2861 behavior. */ | 61 | /* By default, RFC2861 behavior. */ |
62 | int sysctl_tcp_slow_start_after_idle __read_mostly = 1; | 62 | int sysctl_tcp_slow_start_after_idle __read_mostly = 1; |
63 | 63 | ||
64 | static inline void tcp_packets_out_inc(struct sock *sk, | ||
65 | const struct sk_buff *skb) | ||
66 | { | ||
67 | struct tcp_sock *tp = tcp_sk(sk); | ||
68 | int orig = tp->packets_out; | ||
69 | |||
70 | tp->packets_out += tcp_skb_pcount(skb); | ||
71 | if (!orig) | ||
72 | inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS, | ||
73 | inet_csk(sk)->icsk_rto, TCP_RTO_MAX); | ||
74 | } | ||
75 | |||
64 | static void update_send_head(struct sock *sk, struct sk_buff *skb) | 76 | static void update_send_head(struct sock *sk, struct sk_buff *skb) |
65 | { | 77 | { |
66 | struct tcp_sock *tp = tcp_sk(sk); | 78 | struct tcp_sock *tp = tcp_sk(sk); |