Merge tag 'xtensa-20191201' of git://github.com/jcmvbkbc/linux-xtensa

[linux.git] / net / sched / sch_hfsc.c

diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c
index d2ab463f22ae8b122ae43d1969cf795fb11c05b3..433f2190960fe88235a5c6381760596cfc93305a 100644 (file)
--- a/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c
@@ -926,7 +926,8 @@ hfsc_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
        if (opt == NULL)
                return -EINVAL;
 
-       err = nla_parse_nested(tb, TCA_HFSC_MAX, opt, hfsc_policy, NULL);
+       err = nla_parse_nested_deprecated(tb, TCA_HFSC_MAX, opt, hfsc_policy,
+                                         NULL);
        if (err < 0)
                return err;
 
@@ -1300,7 +1301,7 @@ hfsc_dump_class(struct Qdisc *sch, unsigned long arg, struct sk_buff *skb,
        if (cl->level == 0)
                tcm->tcm_info = cl->qdisc->handle;
 
-       nest = nla_nest_start(skb, TCA_OPTIONS);
+       nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
        if (nest == NULL)
                goto nla_put_failure;
        if (hfsc_dump_curves(skb, cl) < 0)