|
@@ -120,27 +120,17 @@ static int mall_set_parms(struct net *net, struct tcf_proto *tp,
|
|
|
unsigned long base, struct nlattr **tb,
|
|
|
struct nlattr *est, bool ovr)
|
|
|
{
|
|
|
- struct tcf_exts e;
|
|
|
int err;
|
|
|
|
|
|
- err = tcf_exts_init(&e, TCA_MATCHALL_ACT, 0);
|
|
|
- if (err)
|
|
|
- return err;
|
|
|
- err = tcf_exts_validate(net, tp, tb, est, &e, ovr);
|
|
|
+ err = tcf_exts_validate(net, tp, tb, est, &head->exts, ovr);
|
|
|
if (err < 0)
|
|
|
- goto errout;
|
|
|
+ return err;
|
|
|
|
|
|
if (tb[TCA_MATCHALL_CLASSID]) {
|
|
|
head->res.classid = nla_get_u32(tb[TCA_MATCHALL_CLASSID]);
|
|
|
tcf_bind_filter(tp, &head->res, base);
|
|
|
}
|
|
|
-
|
|
|
- tcf_exts_change(tp, &head->exts, &e);
|
|
|
-
|
|
|
return 0;
|
|
|
-errout:
|
|
|
- tcf_exts_destroy(&e);
|
|
|
- return err;
|
|
|
}
|
|
|
|
|
|
static int mall_change(struct net *net, struct sk_buff *in_skb,
|