hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5
kernel/net/sched/sch_choke.c
....@@ -1,13 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23 * net/sched/sch_choke.c CHOKE scheduler
34 *
45 * Copyright (c) 2011 Stephen Hemminger <shemminger@vyatta.com>
56 * Copyright (c) 2011 Eric Dumazet <eric.dumazet@gmail.com>
6
- *
7
- * This program is free software; you can redistribute it and/or
8
- * modify it under the terms of the GNU General Public License
9
- * version 2 as published by the Free Software Foundation.
10
- *
117 */
128
139 #include <linux/module.h>
....@@ -135,7 +131,6 @@
135131 }
136132
137133 struct choke_skb_cb {
138
- u16 classid;
139134 u8 keys_valid;
140135 struct flow_keys_digest keys;
141136 };
....@@ -144,11 +139,6 @@
144139 {
145140 qdisc_cb_private_validate(skb, sizeof(struct choke_skb_cb));
146141 return (struct choke_skb_cb *)qdisc_skb_cb(skb)->data;
147
-}
148
-
149
-static inline void choke_set_classid(struct sk_buff *skb, u16 classid)
150
-{
151
- choke_skb_cb(skb)->classid = classid;
152142 }
153143
154144 /*
....@@ -325,8 +315,6 @@
325315 rtnl_qdisc_drop(skb, sch);
326316 }
327317
328
- sch->q.qlen = 0;
329
- sch->qstats.backlog = 0;
330318 if (q->tab)
331319 memset(q->tab, 0, (q->tab_mask + 1) * sizeof(struct sk_buff *));
332320 q->head = q->tail = 0;
....@@ -360,7 +348,8 @@
360348 if (opt == NULL)
361349 return -EINVAL;
362350
363
- err = nla_parse_nested(tb, TCA_CHOKE_MAX, opt, choke_policy, NULL);
351
+ err = nla_parse_nested_deprecated(tb, TCA_CHOKE_MAX, opt,
352
+ choke_policy, NULL);
364353 if (err < 0)
365354 return err;
366355
....@@ -382,7 +371,7 @@
382371 if (mask != q->tab_mask) {
383372 struct sk_buff **ntab;
384373
385
- ntab = kvmalloc_array((mask + 1), sizeof(struct sk_buff *), GFP_KERNEL | __GFP_ZERO);
374
+ ntab = kvcalloc(mask + 1, sizeof(struct sk_buff *), GFP_KERNEL);
386375 if (!ntab)
387376 return -ENOMEM;
388377
....@@ -454,7 +443,7 @@
454443 .Scell_log = q->parms.Scell_log,
455444 };
456445
457
- opts = nla_nest_start(skb, TCA_OPTIONS);
446
+ opts = nla_nest_start_noflag(skb, TCA_OPTIONS);
458447 if (opts == NULL)
459448 goto nla_put_failure;
460449