Merge branch 'remotes/lorenzo/pci/uniphier'

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

diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c
index 687b0af67878b6436550768170784262b5e5b2be..4aafbe3d435c68600f8fa51a3fdd1fe901b8d638 100644 (file)
--- a/net/sched/cls_basic.c
+++ b/net/sched/cls_basic.c
@@ -1,11 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * net/sched/cls_basic.c       Basic Packet 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:    Thomas Graf <tgraf@suug.ch>
  */
 
@@ -185,8 +181,8 @@ static int basic_change(struct net *net, struct sk_buff *in_skb,
        if (tca[TCA_OPTIONS] == NULL)
                return -EINVAL;
 
-       err = nla_parse_nested(tb, TCA_BASIC_MAX, tca[TCA_OPTIONS],
-                              basic_policy, NULL);
+       err = nla_parse_nested_deprecated(tb, TCA_BASIC_MAX, tca[TCA_OPTIONS],
+                                         basic_policy, NULL);
        if (err < 0)
                return err;
 
@@ -288,7 +284,7 @@ static int basic_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;