移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/net/sched/ematch.c
..
..
@@ -1,10 +1,6 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * net/sched/ematch.c		Extended Match API
3
- *
4
- *		This program is free software; you can redistribute it and/or
5
- *		modify it under the terms of the GNU General Public License
6
- *		as published by the Free Software Foundation; either version
7
- *		2 of the License, or (at your option) any later version.
8
4
  *
9
5
  * Authors:	Thomas Graf <tgraf@suug.ch>
10
6
  *
..
..
@@ -317,7 +313,8 @@
317
313
 	if (!nla)
318
314
 		return 0;
319
315
 
320
-	err = nla_parse_nested(tb, TCA_EMATCH_TREE_MAX, nla, em_policy, NULL);
316
+	err = nla_parse_nested_deprecated(tb, TCA_EMATCH_TREE_MAX, nla,
317
+					  em_policy, NULL);
321
318
 	if (err < 0)
322
319
 		goto errout;
323
320
 
..
..
@@ -392,7 +389,6 @@
392
389
 /**
393
390
  * tcf_em_tree_destroy - destroy an ematch tree
394
391
  *
395
- * @tp: classifier kind handle
396
392
  * @tree: ematch tree to be deleted
397
393
  *
398
394
  * This functions destroys an ematch tree previously created by
..
..
@@ -428,7 +424,7 @@
428
424
  * tcf_em_tree_dump - dump ematch tree into a rtnl message
429
425
  *
430
426
  * @skb: skb holding the rtnl message
431
- * @t: ematch tree to be dumped
427
+ * @tree: ematch tree to be dumped
432
428
  * @tlv: TLV type to be used to encapsulate the tree
433
429
  *
434
430
  * This function dumps a ematch tree into a rtnl message. It is valid to
..
..
@@ -443,14 +439,14 @@
443
439
 	struct nlattr *top_start;
444
440
 	struct nlattr *list_start;
445
441
 
446
-	top_start = nla_nest_start(skb, tlv);
442
+	top_start = nla_nest_start_noflag(skb, tlv);
447
443
 	if (top_start == NULL)
448
444
 		goto nla_put_failure;
449
445
 
450
446
 	if (nla_put(skb, TCA_EMATCH_TREE_HDR, sizeof(tree->hdr), &tree->hdr))
451
447
 		goto nla_put_failure;
452
448
 
453
-	list_start = nla_nest_start(skb, TCA_EMATCH_TREE_LIST);
449
+	list_start = nla_nest_start_noflag(skb, TCA_EMATCH_TREE_LIST);
454
450
 	if (list_start == NULL)
455
451
 		goto nla_put_failure;
456
452