From a73c42540dfed6909fa5e52b786b569d6f338907 Mon Sep 17 00:00:00 2001 From: Robert Olsson Date: Tue, 5 Aug 2008 18:44:26 -0700 Subject: [PATCH] --- yaml --- r: 107766 b: refs/heads/master c: 1211a64554065316e02b3c62b320088ad4f63260 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/pktgen.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index babd09ff5897..e0bc8befa161 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef647f1300d69adb8223d970554d59d7e244db6d +refs/heads/master: 1211a64554065316e02b3c62b320088ad4f63260 diff --git a/trunk/net/core/pktgen.c b/trunk/net/core/pktgen.c index 3284605f2ec7..9c87320fdf3f 100644 --- a/trunk/net/core/pktgen.c +++ b/trunk/net/core/pktgen.c @@ -2085,15 +2085,19 @@ static inline int f_pick(struct pktgen_dev *pkt_dev) if (pkt_dev->flows[flow].count >= pkt_dev->lflow) { /* reset time */ pkt_dev->flows[flow].count = 0; + pkt_dev->flows[flow].flags = 0; pkt_dev->curfl += 1; if (pkt_dev->curfl >= pkt_dev->cflows) pkt_dev->curfl = 0; /*reset */ } } else { flow = random32() % pkt_dev->cflows; + pkt_dev->curfl = flow; - if (pkt_dev->flows[flow].count > pkt_dev->lflow) + if (pkt_dev->flows[flow].count > pkt_dev->lflow) { pkt_dev->flows[flow].count = 0; + pkt_dev->flows[flow].flags = 0; + } } return pkt_dev->curfl;