Merge tag 'iommu-updates-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro...

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

diff --git a/net/sched/sch_drr.c b/net/sched/sch_drr.c
index 430df9a55ec4e9742786fb869ab3acf28e84f5ed..07a2b0b354954f4874883f486c8b855a17c4be06 100644 (file)
--- a/net/sched/sch_drr.c
+++ b/net/sched/sch_drr.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * net/sched/sch_drr.c         Deficit Round Robin scheduler
  *
  * Copyright (c) 2008 Patrick McHardy <kaber@trash.net>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
  */
 
 #include <linux/module.h>
@@ -70,7 +67,8 @@ static int drr_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
                return -EINVAL;
        }
 
-       err = nla_parse_nested(tb, TCA_DRR_MAX, opt, drr_policy, extack);
+       err = nla_parse_nested_deprecated(tb, TCA_DRR_MAX, opt, drr_policy,
+                                         extack);
        if (err < 0)
                return err;
 
@@ -244,7 +242,7 @@ static int drr_dump_class(struct Qdisc *sch, unsigned long arg,
        tcm->tcm_handle = cl->common.classid;
        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 (nla_put_u32(skb, TCA_DRR_QUANTUM, cl->quantum))