openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2017-08-04 14:29:06 +02:00 committed by David S. Miller
parent 1e5003af37
commit 455075292b
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/sched/cls_flower.c
View File

@ -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,
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,