From: Gerrit Renker <gerrit@erg.abdn.ac.uk>
To: davem@davemloft.net
Cc: dccp@vger.kernel.org, netdev@vger.kernel.org,
Gerrit Renker <gerrit@erg.abdn.ac.uk>
Subject: [PATCH 2/5] dccp ccid-2: Remove wrappers around sk_{reset,stop}_timer()
Date: Mon, 30 Aug 2010 07:23:11 +0200 [thread overview]
Message-ID: <1283145794-5615-3-git-send-email-gerrit@erg.abdn.ac.uk> (raw)
In-Reply-To: <1283145794-5615-2-git-send-email-gerrit@erg.abdn.ac.uk>
This removes the wrappers around the sk timer functions, since not much is
gained from using them: the BUG_ON in start_rto_timer will never trigger
since that function is called only if:
* the RTO timer expires (rto_expire, and then timer_pending() is false);
* in tx_packet_sent only if !timer_pending() (BUG_ON is redundant here);
* previously in new_ack, after stopping the timer (timer_pending() false).
Removing the wrappers also clears the way for eventually replacing the
RTO timer with the icsk-retransmission-timer, as it is already part of the
DCCP socket.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
---
net/dccp/ccids/ccid2.c | 28 +++-------------------------
1 files changed, 3 insertions(+), 25 deletions(-)
--- a/net/dccp/ccids/ccid2.c
+++ b/net/dccp/ccids/ccid2.c
@@ -111,8 +111,6 @@ static void ccid2_change_l_ack_ratio(struct sock *sk, u32 val)
dp->dccps_l_ack_ratio = val;
}
-static void ccid2_start_rto_timer(struct sock *sk);
-
static void ccid2_hc_tx_rto_expire(unsigned long data)
{
struct sock *sk = (struct sock *)data;
@@ -131,7 +129,7 @@ static void ccid2_hc_tx_rto_expire(unsigned long data)
if (hc->tx_rto > DCCP_RTO_MAX)
hc->tx_rto = DCCP_RTO_MAX;
- ccid2_start_rto_timer(sk);
+ sk_reset_timer(sk, &hc->tx_rtotimer, jiffies + hc->tx_rto);
/* adjust pipe, cwnd etc */
hc->tx_ssthresh = hc->tx_cwnd / 2;
@@ -153,16 +151,6 @@ out:
sock_put(sk);
}
-static void ccid2_start_rto_timer(struct sock *sk)
-{
- struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);
-
- ccid2_pr_debug("setting RTO timeout=%u\n", hc->tx_rto);
-
- BUG_ON(timer_pending(&hc->tx_rtotimer));
- sk_reset_timer(sk, &hc->tx_rtotimer, jiffies + hc->tx_rto);
-}
-
static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len)
{
struct dccp_sock *dp = dccp_sk(sk);
@@ -239,9 +227,7 @@ static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len)
}
#endif
- /* setup RTO timer */
- if (!timer_pending(&hc->tx_rtotimer))
- ccid2_start_rto_timer(sk);
+ sk_reset_timer(sk, &hc->tx_rtotimer, jiffies + hc->tx_rto);
#ifdef CONFIG_IP_DCCP_CCID2_DEBUG
do {
@@ -320,14 +306,6 @@ out_invalid_option:
return -1;
}
-static void ccid2_hc_tx_kill_rto_timer(struct sock *sk)
-{
- struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);
-
- sk_stop_timer(sk, &hc->tx_rtotimer);
- ccid2_pr_debug("deleted RTO timer\n");
-}
-
/**
* ccid2_rtt_estimator - Sample RTT and compute RTO using RFC2988 algorithm
* This code is almost identical with TCP's tcp_rtt_estimator(), since
@@ -692,7 +670,7 @@ static void ccid2_hc_tx_exit(struct sock *sk)
struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);
int i;
- ccid2_hc_tx_kill_rto_timer(sk);
+ sk_stop_timer(sk, &hc->tx_rtotimer);
for (i = 0; i < hc->tx_seqbufc; i++)
kfree(hc->tx_seqbuf[i]);
next prev parent reply other threads:[~2010-08-30 5:23 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <ccid2_and_tcp_code_sharing>
2010-08-30 5:23 ` net-2.6 [PATCH 0/5] dccp: ccid-2 clean-up; code sharing between TCP and DCCP Gerrit Renker
2010-08-30 5:23 ` [PATCH 1/5] dccp ccid-2: Use u32 timestamps uniformly Gerrit Renker
2010-08-30 5:23 ` Gerrit Renker [this message]
2010-08-30 5:23 ` [PATCH 3/5] tcp/dccp: Consolidate common code for RFC 3390 conversion Gerrit Renker
2010-08-30 5:23 ` [PATCH 4/5] dccp ccid-2: Share TCP's minimum RTO code Gerrit Renker
2010-08-30 5:23 ` [PATCH 5/5] dccp ccid-3: use per-route RTO or TCP RTO as fallback Gerrit Renker
2010-08-30 12:59 ` [PATCH 3/5] tcp/dccp: Consolidate common code for RFC 3390 conversion Ilpo Järvinen
2010-09-01 5:23 ` Gerrit Renker
2010-09-01 5:34 ` net-next-2.6 [PATCH 1/1] tcp: add missing initial window (RFC 3390) for tcp_output Gerrit Renker
2010-09-01 7:06 ` Alexander Zimmermann
2010-09-01 10:16 ` Gerrit Renker
2010-09-01 10:28 ` Gerrit Renker
2010-09-02 1:18 ` David Miller
2010-09-01 7:05 ` [PATCH 3/5] tcp/dccp: Consolidate common code for RFC 3390 conversion Alexander Zimmermann
2010-08-30 20:46 ` net-2.6 [PATCH 0/5] dccp: ccid-2 clean-up; code sharing between TCP and DCCP David Miller
2010-08-31 10:38 ` gerrit
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=1283145794-5615-3-git-send-email-gerrit@erg.abdn.ac.uk \
--to=gerrit@erg.abdn.ac.uk \
--cc=davem@davemloft.net \
--cc=dccp@vger.kernel.org \
--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).