Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d997875 authored by Vlad Buslov's avatar Vlad Buslov Committed by David S. Miller
Browse files

Revert "net: sched: fw: don't set arg->stop in fw_walk() when empty" 



This reverts commit 31a99848 ("net: sched: fw: don't set arg->stop in
fw_walk() when empty")

Cls API function tcf_proto_is_empty() was changed in commit
6676d5e4 ("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: default avatarVlad Buslov <vladbu@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e83887f6

net/sched/cls_fw.c

+4 −1
Original line number Diff line number Diff line
@@ -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++) {