Commit 45507529 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller

net: sched: cls_flower: no need to call tcf_exts_change for newly allocated struct

As the f struct was allocated right before fl_set_parms call, no need
to use tcf_exts_change to do atomic change, and we can just fill-up
the unused exts struct directly by tcf_exts_validate.
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1e5003af
...@@ -852,15 +852,11 @@ static int fl_set_parms(struct net *net, struct tcf_proto *tp, ...@@ -852,15 +852,11 @@ static int fl_set_parms(struct net *net, struct tcf_proto *tp,
unsigned long base, struct nlattr **tb, unsigned long base, struct nlattr **tb,
struct nlattr *est, bool ovr) struct nlattr *est, bool ovr)
{ {
struct tcf_exts e;
int err; int err;
err = tcf_exts_init(&e, TCA_FLOWER_ACT, 0); err = tcf_exts_validate(net, tp, tb, est, &f->exts, ovr);
if (err < 0) if (err < 0)
return err; return err;
err = tcf_exts_validate(net, tp, tb, est, &e, ovr);
if (err < 0)
goto errout;
if (tb[TCA_FLOWER_CLASSID]) { if (tb[TCA_FLOWER_CLASSID]) {
f->res.classid = nla_get_u32(tb[TCA_FLOWER_CLASSID]); f->res.classid = nla_get_u32(tb[TCA_FLOWER_CLASSID]);
...@@ -869,17 +865,12 @@ static int fl_set_parms(struct net *net, struct tcf_proto *tp, ...@@ -869,17 +865,12 @@ static int fl_set_parms(struct net *net, struct tcf_proto *tp,
err = fl_set_key(net, tb, &f->key, &mask->key); err = fl_set_key(net, tb, &f->key, &mask->key);
if (err) if (err)
goto errout; return err;
fl_mask_update_range(mask); fl_mask_update_range(mask);
fl_set_masked_key(&f->mkey, &f->key, mask); fl_set_masked_key(&f->mkey, &f->key, mask);
tcf_exts_change(tp, &f->exts, &e);
return 0; return 0;
errout:
tcf_exts_destroy(&e);
return err;
} }
static u32 fl_grab_new_handle(struct tcf_proto *tp, static u32 fl_grab_new_handle(struct tcf_proto *tp,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment