[trickle/f16] Fix endless loop in bwstat_delay (#738729)

Nicoleau Fabien eponyme at fedoraproject.org
Mon Sep 19 19:14:06 UTC 2011


commit 63e2ec92e3db1bd35beabf7888a09f01a60b1a9f
Author: eponyme <eponyme at fedoraproject.org>
Date:   Mon Sep 19 21:16:30 2011 +0200

    Fix endless loop in bwstat_delay (#738729)

 ...le-1.07-bwsta_getdelay-stop-if-no-packets.patch |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/trickle-1.07-bwsta_getdelay-stop-if-no-packets.patch b/trickle-1.07-bwsta_getdelay-stop-if-no-packets.patch
index f9245b4..5ff6eda 100644
--- a/trickle-1.07-bwsta_getdelay-stop-if-no-packets.patch
+++ b/trickle-1.07-bwsta_getdelay-stop-if-no-packets.patch
@@ -13,13 +13,12 @@ index a1c1085..9567275 100644
 +++ b/bwstat.c
 @@ -210,7 +210,7 @@ bwstat_getdelay(struct bwstat *bs, size_t *len, uint lim, short which)
  
-    ent += xent;
-   }
-- } while (pool > 0 && ncli > 0);
-+ } while (pool > 0 && ncli > 0 && (TAILQ_FIRST(&poolq) != TAILQ_END(&poolq)));
+ 			ent += xent;
+ 		}
+-	} while (pool > 0 && ncli > 0);
++	} while (pool > 0 && ncli > 0 && (TAILQ_FIRST(&poolq) != TAILQ_END(&poolq)));
  
-  /*
-   * This is the case of a client that is not using its limit.
+ 	/*
+ 	 * This is the case of a client that is not using its limit.
 -- 
 1.7.6.2
-


More information about the scm-commits mailing list