Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c
index f006af23b64a8e85c066f404a2761c85b2d3a77a..2d9e0b4484ea7133bc7294f0ca123cd813e952f8 100644 (file)
--- a/net/sched/cls_route.c
+++ b/net/sched/cls_route.c
@@ -1,11 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * net/sched/cls_route.c       ROUTE4 classifier.
  *
- *             This program is free software; you can redistribute it and/or
- *             modify it under the terms of the GNU General Public License
- *             as published by the Free Software Foundation; either version
- *             2 of the License, or (at your option) any later version.
- *
  * Authors:    Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
@@ -484,7 +480,8 @@ static int route4_change(struct net *net, struct sk_buff *in_skb,
        if (opt == NULL)
                return handle ? -EINVAL : 0;
 
-       err = nla_parse_nested(tb, TCA_ROUTE4_MAX, opt, route4_policy, NULL);
+       err = nla_parse_nested_deprecated(tb, TCA_ROUTE4_MAX, opt,
+                                         route4_policy, NULL);
        if (err < 0)
                return err;
 
@@ -607,7 +604,7 @@ static int route4_dump(struct net *net, struct tcf_proto *tp, void *fh,
 
        t->tcm_handle = f->handle;
 
-       nest = nla_nest_start(skb, TCA_OPTIONS);
+       nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
        if (nest == NULL)
                goto nla_put_failure;