diff options
| author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2007-06-16 13:48:50 -0300 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-10 22:15:34 -0700 |
| commit | 49d66a70cf9fd94057aacd6055334299ab3a5eac (patch) | |
| tree | 2feed7f094e3b2a45b7d3a211c2a3b33c61cbfb1 | |
| parent | 8132da4d412ad51c34bad11133a8f0941e2a1972 (diff) | |
| download | op-kernel-dev-49d66a70cf9fd94057aacd6055334299ab3a5eac.zip op-kernel-dev-49d66a70cf9fd94057aacd6055334299ab3a5eac.tar.gz | |
[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 can
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; when
the time difference is less than 1000, the packet will have its options added
and window counter updated as required.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
| -rw-r--r-- | 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); |
