path: root/net/sched/cls_fw.c
diff options
authorVlad Buslov <vladbu@mellanox.com>2019-02-27 15:49:17 +0200
committerDavid S. Miller <davem@davemloft.net>2019-02-27 10:12:19 -0800
commit1d9978757d387dc64ad5e9ee021d1e3cb5082e07 (patch)
tree120157cf4564c5ee5ee93a0d10a925b515b82760 /net/sched/cls_fw.c
parentethtool: Use explicit designated initializers for .cmd (diff)
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 '')
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)
for (h = 0; h < HTSIZE; h++) {