summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorThomas Graf <tgraf@suug.ch>2005-05-31 15:15:58 -0700
committerDavid S. Miller <davem@davemloft.net>2005-05-31 15:15:58 -0700
commit0451eb074eef30240c6c06dacf2911bee26831e1 (patch)
treeea4504b5d2d7b0662757dd3c49f5f6919baf627d /net
parent208d89843b7b03978d8e748b8b991c1be81c4f43 (diff)
downloadop-kernel-dev-0451eb074eef30240c6c06dacf2911bee26831e1.zip
op-kernel-dev-0451eb074eef30240c6c06dacf2911bee26831e1.tar.gz
[PKT_SCHED]: Fix dsmark to count ignored indices while walking
Unused indices which are ignored while walking must still be counted to avoid dumping the same index twice. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/sched/sch_dsmark.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c
index 8a3db9d..acbe9d2 100644
--- a/net/sched/sch_dsmark.c
+++ b/net/sched/sch_dsmark.c
@@ -163,14 +163,15 @@ static void dsmark_walk(struct Qdisc *sch,struct qdisc_walker *walker)
return;
for (i = 0; i < p->indices; i++) {
if (p->mask[i] == 0xff && !p->value[i])
- continue;
+ goto ignore;
if (walker->count >= walker->skip) {
if (walker->fn(sch, i+1, walker) < 0) {
walker->stop = 1;
break;
}
}
- walker->count++;
+ignore:
+ walker->count++;
}
}
OpenPOWER on IntegriCloud