1 files changed, 9 insertions, 9 deletions

diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index 6777a7f33a9a..9297fca78683 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -154,16 +154,14 @@ static void ccid3_hc_tx_update_x(struct sock *sk)
 static void ccid3_hc_tx_no_feedback_timer(unsigned long data)
 {
         struct sock *sk = (struct sock *)data;
-        unsigned long next_tmout = 0;
         struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk);
+        unsigned long next_tmout = USEC_PER_SEC / 5;
 
         bh_lock_sock(sk);
         if (sock_owned_by_user(sk)) {
                 /* Try again later. */
                 /* XXX: set some sensible MIB */
-                sk_reset_timer(sk, &hctx->ccid3hctx_no_feedback_timer,
-                               jiffies + HZ / 5);
-                goto out;
+                goto restart_timer;
         }
 
         ccid3_pr_debug("%s, sk=%p, state=%s\n", dccp_role(sk), sk,
@@ -183,9 +181,9 @@ static void ccid3_hc_tx_no_feedback_timer(unsigned long data)
                                dccp_role(sk), sk,
                                ccid3_tx_state_name(hctx->ccid3hctx_state),
                                hctx->ccid3hctx_x);
-                next_tmout = max_t(u32, 2 * usecs_div(hctx->ccid3hctx_s,
-                                                      hctx->ccid3hctx_x),
-                                        TFRC_INITIAL_TIMEOUT);
+                /* The value of R is still undefined and so we can not recompute
+                 * the timout value. Keep initial value as per [RFC 4342, 5]. */
+                next_tmout = TFRC_INITIAL_TIMEOUT;
                 /*
                  * FIXME - not sure above calculation is correct. See section
                  * 5 of CCID3 11 should adjust tx_t_ipi and double that to
@@ -239,9 +237,11 @@ static void ccid3_hc_tx_no_feedback_timer(unsigned long data)
                 goto out;
         }
 
-        sk_reset_timer(sk, &hctx->ccid3hctx_no_feedback_timer, 
-                      jiffies + max_t(u32, 1, usecs_to_jiffies(next_tmout)));
         hctx->ccid3hctx_idle = 1;
+
+restart_timer:
+        sk_reset_timer(sk, &hctx->ccid3hctx_no_feedback_timer,
+                           jiffies + usecs_to_jiffies(next_tmout));
 out:
         bh_unlock_sock(sk);
         sock_put(sk);