diff options
| author |   Vlad Buslov <vladbu@mellanox.com> | 2020-02-17 12:12:12 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-02-17 14:17:02 -0800 |
| commit | b15e7a6e8d31d6abe2d98929d60ad3a0e6ae4de1 (patch) | |
| tree | 3b1986c5151784433053007868f85e4046cd06de /net/sched/cls_flower.c | |
| parent | net: sched: refactor ct action helpers to require tcf_lock (diff) | |
| download | linux-dev-b15e7a6e8d31d6abe2d98929d60ad3a0e6ae4de1.tar.xz linux-dev-b15e7a6e8d31d6abe2d98929d60ad3a0e6ae4de1.zip | |
net: sched: don't take rtnl lock during flow_action setup
Refactor tc_setup_flow_action() function not to use rtnl lock and remove
'rtnl_held' argument that is no longer needed.
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/cls_flower.c')
| -rw-r--r-- | net/sched/cls_flower.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index 7e54d2ab5254..726fc9c5910f 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -449,8 +449,7 @@ static int fl_hw_replace_filter(struct tcf_proto *tp, cls_flower.rule->match.key = &f->mkey; cls_flower.classid = f->res.classid; - err = tc_setup_flow_action(&cls_flower.rule->action, &f->exts, - rtnl_held); + err = tc_setup_flow_action(&cls_flower.rule->action, &f->exts); if (err) { kfree(cls_flower.rule); if (skip_sw) { @@ -2000,8 +1999,7 @@ static int fl_reoffload(struct tcf_proto *tp, bool add, flow_setup_cb_t *cb, cls_flower.rule->match.mask = &f->mask->key; cls_flower.rule->match.key = &f->mkey; - err = tc_setup_flow_action(&cls_flower.rule->action, &f->exts, - true); + err = tc_setup_flow_action(&cls_flower.rule->action, &f->exts); if (err) { kfree(cls_flower.rule); if (tc_skip_sw(f->flags)) { |