diff options
| author |   Jiri Pirko <jiri@mellanox.com> | 2017-08-04 14:29:09 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-08-04 11:21:24 -0700 |
| commit | ff1f8ca0805ab03c31e14a9356aa2ac81d65c338 (patch) | |
| tree | 017eceade4f7cdffaf3c61f3150b8de68e5e44f8 /net | |
| parent | net: sched: cls_matchall: no need to call tcf_exts_change for newly allocated struct (diff) | |
| download | linux-dev-ff1f8ca0805ab03c31e14a9356aa2ac81d65c338.tar.xz linux-dev-ff1f8ca0805ab03c31e14a9356aa2ac81d65c338.zip | |
net: sched: cls_basic: no need to call tcf_exts_change for newly allocated struct
As the f struct was allocated right before basic_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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sched/cls_basic.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c index 979cd2683b46..7c7a82138f76 100644 --- a/net/sched/cls_basic.c +++ b/net/sched/cls_basic.c @@ -129,31 +129,22 @@ static int basic_set_parms(struct net *net, struct tcf_proto *tp, struct nlattr *est, bool ovr) { int err; - struct tcf_exts e; - err = tcf_exts_init(&e, TCA_BASIC_ACT, TCA_BASIC_POLICE); + err = tcf_exts_validate(net, tp, tb, est, &f->exts, ovr); if (err < 0) return err; - err = tcf_exts_validate(net, tp, tb, est, &e, ovr); - if (err < 0) - goto errout; err = tcf_em_tree_validate(tp, tb[TCA_BASIC_EMATCHES], &f->ematches); if (err < 0) - goto errout; + return err; if (tb[TCA_BASIC_CLASSID]) { f->res.classid = nla_get_u32(tb[TCA_BASIC_CLASSID]); tcf_bind_filter(tp, &f->res, base); } - tcf_exts_change(tp, &f->exts, &e); f->tp = tp; - return 0; -errout: - tcf_exts_destroy(&e); - return err; } static int basic_change(struct net *net, struct sk_buff *in_skb, |