Skip to content

Commit

Permalink
Revert "net: sched: fw: don't set arg->stop in fw_walk() when empty"
Browse files Browse the repository at this point in the history
This reverts commit 31a9984 ("net: sched: fw: don't set arg->stop in
fw_walk() when empty")

Cls API function tcf_proto_is_empty() was changed in commit
6676d5e ("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>
  • Loading branch information
Vlad Buslov authored and David S. Miller committed Feb 27, 2019
1 parent e83887f commit 1d99787
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion net/sched/cls_fw.c
Original file line number Diff line number Diff line change
Expand Up @@ -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++) {
Expand Down

0 comments on commit 1d99787

Please sign in to comment.