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>

diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c
index 456ee6e62dfa8690ade04284873d6d386d084ba5..ad036b00427d92859393773eb0a9d99e2da14e4b 100644 (file)
--- 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++) {