aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp
diff options
context:
space:
mode:
authorGerrit Renker <gerrit@erg.abdn.ac.uk>2007-03-20 12:10:15 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:26:47 -0400
commit353b13e10a3f1a18c6b33858fb3337bcd2692eb5 (patch)
treede428797382777f58a30648a64296825f03cd8a5 /net/dccp
parent8d13bf9a0bd4984756e234ce54299b92acefab99 (diff)
[CCID3]: Remove redundant `len' test
Since CCID3 avoids sending 0-byte data packets (cf. ccid3_hc_tx_send_packet), testing for zero-payload length, as performed by ccid3_hc_tx_update_s, is redundant - hence removed by this patch. Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
-rw-r--r--net/dccp/ccids/ccid3.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index 746f79d104b3..4be62a965663 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -149,11 +149,8 @@ static void ccid3_hc_tx_update_x(struct sock *sk, struct timeval *now)
149 */ 149 */
150static inline void ccid3_hc_tx_update_s(struct ccid3_hc_tx_sock *hctx, int len) 150static inline void ccid3_hc_tx_update_s(struct ccid3_hc_tx_sock *hctx, int len)
151{ 151{
152 if (unlikely(len == 0)) 152 hctx->ccid3hctx_s = hctx->ccid3hctx_s == 0 ? len :
153 ccid3_pr_debug("Packet payload length is 0 - not updating\n"); 153 (9 * hctx->ccid3hctx_s + len) / 10;
154 else
155 hctx->ccid3hctx_s = hctx->ccid3hctx_s == 0 ? len :
156 (9 * hctx->ccid3hctx_s + len) / 10;
157 /* 154 /*
158 * Note: We could do a potential optimisation here - when `s' changes, 155 * Note: We could do a potential optimisation here - when `s' changes,
159 * recalculate sending rate and consequently t_ipi, t_delta, and 156 * recalculate sending rate and consequently t_ipi, t_delta, and