netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Ilpo Järvinen" <ilpo.jarvinen@helsinki.fi>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, "Ilpo Järvinen" <ilpo.jarvinen@helsinki.fi>
Subject: [PATCH 2/5] [TCP]: tcp_packets_out_inc to tcp_output.c (no callers elsewhere)
Date: Mon, 20 Aug 2007 16:16:30 +0300	[thread overview]
Message-ID: <1187615793583-git-send-email-ilpo.jarvinen@helsinki.fi> (raw)
In-Reply-To: <1187615793197-git-send-email-ilpo.jarvinen@helsinki.fi>

From: =?ISO-8859-1?q?Ilpo_J=E4rvinen?= <ilpo.jarvinen@helsinki.fi>

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
---
 include/net/tcp.h     |   12 ------------
 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 6d586ca..f28f382 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -614,18 +614,6 @@ static inline void tcp_dec_pcount_approx(__u32 *count,
 	tcp_dec_pcount_approx_int(count, tcp_skb_pcount(skb));
 }
 
-static inline void tcp_packets_out_inc(struct sock *sk,
-				       const struct sk_buff *skb)
-{
-	struct tcp_sock *tp = tcp_sk(sk);
-	int orig = tp->packets_out;
-
-	tp->packets_out += tcp_skb_pcount(skb);
-	if (!orig)
-		inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
-					  inet_csk(sk)->icsk_rto, TCP_RTO_MAX);
-}
-
 /* Events passed to congestion control interface */
 enum tcp_ca_event {
 	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 1d65ce1..a61a3e3 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;
 /* By default, RFC2861 behavior.  */
 int sysctl_tcp_slow_start_after_idle __read_mostly = 1;
 
+static inline void tcp_packets_out_inc(struct sock *sk,
+				       const struct sk_buff *skb)
+{
+	struct tcp_sock *tp = tcp_sk(sk);
+	int orig = tp->packets_out;
+
+	tp->packets_out += tcp_skb_pcount(skb);
+	if (!orig)
+		inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
+					  inet_csk(sk)->icsk_rto, TCP_RTO_MAX);
+}
+
 static void update_send_head(struct sock *sk, struct sk_buff *skb)
 {
 	struct tcp_sock *tp = tcp_sk(sk);
-- 
1.5.0.6


  reply	other threads:[~2007-08-20 13:16 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-08-20 13:16 [PATCH net-2.6.24 0/5] TCP: Cleanups & SACK block validation Ilpo Järvinen
2007-08-20 13:16 ` [PATCH 1/5] [TCP]: Remove unnecessary wrapper tcp_packets_out_dec Ilpo Järvinen
2007-08-20 13:16   ` Ilpo Järvinen [this message]
2007-08-20 13:16     ` [PATCH 3/5] [TCP]: Rename tcp_ack_packets_out -> tcp_rearm_rto Ilpo Järvinen
2007-08-20 13:16       ` [PATCH 4/5] [TCP]: Discard fuzzy SACK blocks Ilpo Järvinen
2007-08-20 13:16         ` [PATCH 5/5] [TCP] MIB: Add counters for discarded " Ilpo Järvinen
2007-08-25  5:56           ` David Miller
2007-08-25  5:55         ` [PATCH 4/5] [TCP]: Discard fuzzy " David Miller
2007-08-25  8:47           ` Ilpo Järvinen
2007-08-25  5:53       ` [PATCH 3/5] [TCP]: Rename tcp_ack_packets_out -> tcp_rearm_rto David Miller
2007-08-25  5:44     ` [PATCH 2/5] [TCP]: tcp_packets_out_inc to tcp_output.c (no callers elsewhere) David Miller
2007-08-25  5:43   ` [PATCH 1/5] [TCP]: Remove unnecessary wrapper tcp_packets_out_dec David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1187615793583-git-send-email-ilpo.jarvinen@helsinki.fi \
    --to=ilpo.jarvinen@helsinki.fi \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).