From ad27013569e8327777b1f88cc428a548f4b50776 Mon Sep 17 00:00:00 2001 From: Gerrit Renker Date: Sat, 23 Aug 2008 13:28:27 +0200 Subject: [PATCH] --- yaml --- r: 111451 b: refs/heads/master c: 959fd992f05b7468bf30d759ac0c9fd0ef0fa80b h: refs/heads/master i: 111449: dcf2126d2d84a6a9161cf22cdd4ad2b707fc2770 111447: df9ec637a8f97d436d045596fbd4fbda1bf72342 v: v3 --- [refs] | 2 +- trunk/net/dccp/ccids/lib/loss_interval.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index eea00d9e0830..da9ab11083a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 432649916b0435b608fb3e1fcb97347ac294d38d +refs/heads/master: 959fd992f05b7468bf30d759ac0c9fd0ef0fa80b diff --git a/trunk/net/dccp/ccids/lib/loss_interval.c b/trunk/net/dccp/ccids/lib/loss_interval.c index bcd6ac415bb9..5b3ce0688c5c 100644 --- a/trunk/net/dccp/ccids/lib/loss_interval.c +++ b/trunk/net/dccp/ccids/lib/loss_interval.c @@ -67,7 +67,10 @@ static void tfrc_lh_calc_i_mean(struct tfrc_loss_hist *lh) u32 i_i, i_tot0 = 0, i_tot1 = 0, w_tot = 0; int i, k = tfrc_lh_length(lh) - 1; /* k is as in rfc3448bis, 5.4 */ - for (i=0; i <= k; i++) { + if (k <= 0) + return; + + for (i = 0; i <= k; i++) { i_i = tfrc_lh_get_interval(lh, i); if (i < k) { @@ -78,7 +81,6 @@ static void tfrc_lh_calc_i_mean(struct tfrc_loss_hist *lh) i_tot1 += i_i * tfrc_lh_weights[i-1]; } - BUG_ON(w_tot == 0); lh->i_mean = max(i_tot0, i_tot1) / w_tot; }