diff options
| author | Vlad Buslov <vladbu@mellanox.com> | 2019-02-27 14:49:17 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-27 19:12:19 +0100 |
| commit | 1d9978757d387dc64ad5e9ee021d1e3cb5082e07 (patch) | |
| tree | 120157cf4564c5ee5ee93a0d10a925b515b82760 /net/sched/cls_fw.c | |
| parent | ethtool: Use explicit designated initializers for .cmd (diff) | |
| download | linux-1d9978757d387dc64ad5e9ee021d1e3cb5082e07.tar.xz linux-1d9978757d387dc64ad5e9ee021d1e3cb5082e07.zip | |
Revert "net: sched: fw: don't set arg->stop in fw_walk() when empty"
This reverts commit 31a998487641 ("net: sched: fw: don't set arg->stop in
fw_walk() when empty")
Cls API function tcf_proto_is_empty() was changed in commit
6676d5e416ee ("net: sched: set dedicated tcf_walker flag when tp is empty")
to no longer depend on arg->stop to determine that classifier instance is
empty. Instead, it adds dedicated arg->nonempty field, which makes the fix
in fw classifier no longer necessary.
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/cls_fw.c')
| -rw-r--r-- | net/sched/cls_fw.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c index 456ee6e62dfa..ad036b00427d 100644 --- a/net/sched/cls_fw.c +++ b/net/sched/cls_fw.c @@ -363,7 +363,10 @@ static void fw_walk(struct tcf_proto *tp, struct tcf_walker *arg, struct fw_head *head = rtnl_dereference(tp->root); int h; - if (head == NULL || arg->stop) + if (head == NULL) + arg->stop = 1; + + if (arg->stop) return; for (h = 0; h < HTSIZE; h++) { |