| Message ID | 20190226153440.17349-1-vladbu@mellanox.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] net: sched: fix typo in walker_check_empty() | expand |
From: Vlad Buslov <vladbu@mellanox.com> Date: Tue, 26 Feb 2019 17:34:40 +0200 > Function walker_check_empty() incorrectly verifies that tp pointer is not > NULL, instead of actual filter pointer. Fix conditional to check the right > pointer. Adjust filter pointer naming accordingly to other cls API > functions. > > Fixes: 6676d5e416ee ("net: sched: set dedicated tcf_walker flag when tp is empty") > Signed-off-by: Vlad Buslov <vladbu@mellanox.com> > Reported-by: Cong Wang <xiyou.wangcong@gmail.com> Applied.
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index cffb7f710de7..578051f8f448 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -238,10 +238,10 @@ static void tcf_proto_put(struct tcf_proto *tp, bool rtnl_held, tcf_proto_destroy(tp, rtnl_held, extack); } -static int walker_check_empty(struct tcf_proto *tp, void *d, +static int walker_check_empty(struct tcf_proto *tp, void *fh, struct tcf_walker *arg) { - if (tp) { + if (fh) { arg->nonempty = true; return -1; }
Function walker_check_empty() incorrectly verifies that tp pointer is not NULL, instead of actual filter pointer. Fix conditional to check the right pointer. Adjust filter pointer naming accordingly to other cls API functions. Fixes: 6676d5e416ee ("net: sched: set dedicated tcf_walker flag when tp is empty") Signed-off-by: Vlad Buslov <vladbu@mellanox.com> Reported-by: Cong Wang <xiyou.wangcong@gmail.com> --- net/sched/cls_api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)