Merge tag 'vfio-v5.2-rc1' of git://github.com/awilliam/linux-vfio

[linux-2.6-microblaze.git] / net / sched / cls_bpf.c

diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c
index b4ac580..27365ed 100644 (file)
--- a/net/sched/cls_bpf.c
+++ b/net/sched/cls_bpf.c
@@ -157,8 +157,7 @@ static int cls_bpf_offload_cmd(struct tcf_proto *tp, struct cls_bpf_prog *prog,
        skip_sw = prog && tc_skip_sw(prog->gen_flags);
        obj = prog ?: oldprog;
 
-       tc_cls_common_offload_init(&cls_bpf.common, tp, obj->gen_flags,
-                                  extack);
+       tc_cls_common_offload_init(&cls_bpf.common, tp, obj->gen_flags, extack);
        cls_bpf.command = TC_CLSBPF_OFFLOAD;
        cls_bpf.exts = &obj->exts;
        cls_bpf.prog = prog ? prog->filter : NULL;
@@ -468,8 +467,8 @@ static int cls_bpf_change(struct net *net, struct sk_buff *in_skb,
        if (tca[TCA_OPTIONS] == NULL)
                return -EINVAL;
 
-       ret = nla_parse_nested(tb, TCA_BPF_MAX, tca[TCA_OPTIONS], bpf_policy,
-                              NULL);
+       ret = nla_parse_nested_deprecated(tb, TCA_BPF_MAX, tca[TCA_OPTIONS],
+                                         bpf_policy, NULL);
        if (ret < 0)
                return ret;
 
@@ -591,7 +590,7 @@ static int cls_bpf_dump(struct net *net, struct tcf_proto *tp, void *fh,
 
        cls_bpf_offload_update_stats(tp, prog);
 
-       nest = nla_nest_start(skb, TCA_OPTIONS);
+       nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
        if (nest == NULL)
                goto nla_put_failure;