Merge tag 'intel-pinctrl-fixes-v5.4-2' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / net / sched / cls_rsvp.h

diff --git a/net/sched/cls_rsvp.h b/net/sched/cls_rsvp.h
index 0719a21d9c4127fae62754986e2d620b3c99422f..2f3c03b25d5d7a8e44460276fc52a67ae204693e 100644 (file)
--- a/net/sched/cls_rsvp.h
+++ b/net/sched/cls_rsvp.h
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * net/sched/cls_rsvp.h        Template file for RSVPv[46] classifiers.
  *
- *             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>
  */
 
@@ -497,7 +493,8 @@ static int rsvp_change(struct net *net, struct sk_buff *in_skb,
        if (opt == NULL)
                return handle ? -EINVAL : 0;
 
-       err = nla_parse_nested(tb, TCA_RSVP_MAX, opt, rsvp_policy, NULL);
+       err = nla_parse_nested_deprecated(tb, TCA_RSVP_MAX, opt, rsvp_policy,
+                                         NULL);
        if (err < 0)
                return err;
 
@@ -706,7 +703,7 @@ static int rsvp_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;