From 843869e335108c6fdeae07fa55dde868264207f8 Mon Sep 17 00:00:00 2001 From: Gerrit Renker Date: Mon, 27 Nov 2006 12:27:55 -0200 Subject: [PATCH] --- yaml --- r: 41885 b: refs/heads/master c: 70dbd5b0ef3915f1e018e6437c8db9e999b0d701 h: refs/heads/master i: 41883: 73182a108e37ef3af823d67491b1bf0fe591e2cb v: v3 --- [refs] | 2 +- trunk/net/dccp/ccids/ccid3.c | 21 --------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/[refs] b/[refs] index 54efce291280..fde3743ce7c8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da335baf9e788edfb00ee3b96f7b9526b6b2f8a9 +refs/heads/master: 70dbd5b0ef3915f1e018e6437c8db9e999b0d701 diff --git a/trunk/net/dccp/ccids/ccid3.c b/trunk/net/dccp/ccids/ccid3.c index 62c304200eda..58f7cac6aa3d 100644 --- a/trunk/net/dccp/ccids/ccid3.c +++ b/trunk/net/dccp/ccids/ccid3.c @@ -384,27 +384,6 @@ static void ccid3_hc_tx_packet_sent(struct sock *sk, int more, int len) } else ccid3_pr_debug("%s, sk=%p, seqno=%llu NOT inserted!\n", dccp_role(sk), sk, dp->dccps_gss); - - switch (hctx->ccid3hctx_state) { - case TFRC_SSTATE_NO_SENT: - /* fall through */ - case TFRC_SSTATE_NO_FBACK: - /* t_nom, t_ipi, delta do not change until feedback arrives */ - return; - case TFRC_SSTATE_FBACK: - if (len > 0) { - timeval_sub_usecs(&hctx->ccid3hctx_t_nom, - hctx->ccid3hctx_t_ipi); - ccid3_calc_new_t_ipi(hctx); - ccid3_calc_new_delta(hctx); - timeval_add_usecs(&hctx->ccid3hctx_t_nom, - hctx->ccid3hctx_t_ipi); - } - break; - case TFRC_SSTATE_TERM: - DCCP_BUG("Illegal %s state TERM, sk=%p", dccp_role(sk), sk); - break; - } } static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)