Commit:     49d66a70cf9fd94057aacd6055334299ab3a5eac
Parent:     8132da4d412ad51c34bad11133a8f0941e2a1972
Author:     Gerrit Renker <[EMAIL PROTECTED]>
AuthorDate: Sat Jun 16 13:48:50 2007 -0300
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Tue Jul 10 22:15:34 2007 -0700

    [CCID3]: Fix a bug in the send time processing
    ccid3_hc_tx_send_packet currently returns 0 when the time difference between
    current time and t_nom is less than 1000 microseconds.
    In this case the packet is sent immediately; but, unlike other packets that 
    be emitted on first attempt, it will not have its window counter updated and
    its options set as required. This is a bug.
    Fix: Require the time difference to be at least 1000 microseconds. The
    algorithm then converges: time differences > 1000 microseconds trigger the
    timer in dccp_write_xmit; after timer expiry this function is tried again; 
    the time difference is less than 1000, the packet will have its options 
    and window counter updated as required.
    Signed-off-by: Gerrit Renker <[EMAIL PROTECTED]>
    Signed-off-by: Arnaldo Carvalho de Melo <[EMAIL PROTECTED]>
 net/dccp/ccids/ccid3.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index 94b3a1a..e91c2b9 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -363,7 +363,7 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, struct 
sk_buff *skb)
                 * else
                 *       // send the packet in (t_nom - t_now) milliseconds.
-               if (delay - (s64)hctx->ccid3hctx_delta >= 0)
+               if (delay - (s64)hctx->ccid3hctx_delta >= 1000)
                        return (u32)delay / 1000L;
                ccid3_hc_tx_update_win_count(hctx, now);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to