enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/drivers/net/ieee802154/mac802154_hwsim.c
..
..
@@ -1,17 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * HWSIM IEEE 802.15.4 interface
3
4
  *
4
5
  * (C) 2018 Mojatau, Alexander Aring <aring@mojatau.com>
5
6
  * Copyright 2007-2012 Siemens AG
6
- *
7
- * This program is free software; you can redistribute it and/or modify
8
- * it under the terms of the GNU General Public License version 2
9
- * as published by the Free Software Foundation.
10
- *
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
- * GNU General Public License for more details.
15
7
  *
16
8
  * Based on fakelb, original Written by:
17
9
  * Sergey Lapin <slapin@ossfans.org>
..
..
@@ -36,8 +28,6 @@
36
28
 
37
29
 static LIST_HEAD(hwsim_phys);
38
30
 static DEFINE_MUTEX(hwsim_phys_lock);
39
-
40
-static LIST_HEAD(hwsim_ifup_phys);
41
31
 
42
32
 static struct platform_device *mac802154hwsim_dev;
43
33
 
..
..
@@ -85,7 +75,6 @@
85
75
 	struct list_head edges;
86
76
 
87
77
 	struct list_head list;
88
-	struct list_head list_ifup;
89
78
 };
90
79
 
91
80
 static int hwsim_add_one(struct genl_info *info, struct device *dev,
..
..
@@ -159,9 +148,6 @@
159
148
 	struct hwsim_phy *phy = hw->priv;
160
149
 
161
150
 	phy->suspended = false;
162
-	list_add_rcu(&phy->list_ifup, &hwsim_ifup_phys);
163
-	synchronize_rcu();
164
-
165
151
 	return 0;
166
152
 }
167
153
 
..
..
@@ -170,8 +156,6 @@
170
156
 	struct hwsim_phy *phy = hw->priv;
171
157
 
172
158
 	phy->suspended = true;
173
-	list_del_rcu(&phy->list_ifup);
174
-	synchronize_rcu();
175
159
 }
176
160
 
177
161
 static int
..
..
@@ -235,14 +219,16 @@
235
219
 		return 0;
236
220
 	}
237
221
 
238
-	nl_edges = nla_nest_start(skb, MAC802154_HWSIM_ATTR_RADIO_EDGES);
222
+	nl_edges = nla_nest_start_noflag(skb,
223
+					 MAC802154_HWSIM_ATTR_RADIO_EDGES);
239
224
 	if (!nl_edges) {
240
225
 		rcu_read_unlock();
241
226
 		return -ENOBUFS;
242
227
 	}
243
228
 
244
229
 	list_for_each_entry_rcu(e, &phy->edges, list) {
245
-		nl_edge = nla_nest_start(skb, MAC802154_HWSIM_ATTR_RADIO_EDGE);
230
+		nl_edge = nla_nest_start_noflag(skb,
231
+						MAC802154_HWSIM_ATTR_RADIO_EDGE);
246
232
 		if (!nl_edge) {
247
233
 			rcu_read_unlock();
248
234
 			nla_nest_cancel(skb, nl_edges);
..
..
@@ -436,9 +422,7 @@
436
422
 	    !info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE])
437
423
 		return -EINVAL;
438
424
 
439
-	if (nla_parse_nested(edge_attrs, MAC802154_HWSIM_EDGE_ATTR_MAX,
440
-			     info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE],
441
-			     hwsim_edge_policy, NULL))
425
+	if (nla_parse_nested_deprecated(edge_attrs, MAC802154_HWSIM_EDGE_ATTR_MAX, info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE], hwsim_edge_policy, NULL))
442
426
 		return -EINVAL;
443
427
 
444
428
 	if (!edge_attrs[MAC802154_HWSIM_EDGE_ATTR_ENDPOINT_ID])
..
..
@@ -500,9 +484,7 @@
500
484
 	    !info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE])
501
485
 		return -EINVAL;
502
486
 
503
-	if (nla_parse_nested(edge_attrs, MAC802154_HWSIM_EDGE_ATTR_MAX,
504
-			     info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE],
505
-			     hwsim_edge_policy, NULL))
487
+	if (nla_parse_nested_deprecated(edge_attrs, MAC802154_HWSIM_EDGE_ATTR_MAX, info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE], hwsim_edge_policy, NULL))
506
488
 		return -EINVAL;
507
489
 
508
490
 	if (!edge_attrs[MAC802154_HWSIM_EDGE_ATTR_ENDPOINT_ID])
..
..
@@ -550,9 +532,7 @@
550
532
 	    !info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE])
551
533
 		return -EINVAL;
552
534
 
553
-	if (nla_parse_nested(edge_attrs, MAC802154_HWSIM_EDGE_ATTR_MAX,
554
-			     info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE],
555
-			     hwsim_edge_policy, NULL))
535
+	if (nla_parse_nested_deprecated(edge_attrs, MAC802154_HWSIM_EDGE_ATTR_MAX, info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE], hwsim_edge_policy, NULL))
556
536
 		return -EINVAL;
557
537
 
558
538
 	if (!edge_attrs[MAC802154_HWSIM_EDGE_ATTR_ENDPOINT_ID] ||
..
..
@@ -603,40 +583,40 @@
603
583
 };
604
584
 
605
585
 /* Generic Netlink operations array */
606
-static const struct genl_ops hwsim_nl_ops[] = {
586
+static const struct genl_small_ops hwsim_nl_ops[] = {
607
587
 	{
608
588
 		.cmd = MAC802154_HWSIM_CMD_NEW_RADIO,
609
-		.policy = hwsim_genl_policy,
589
+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
610
590
 		.doit = hwsim_new_radio_nl,
611
591
 		.flags = GENL_UNS_ADMIN_PERM,
612
592
 	},
613
593
 	{
614
594
 		.cmd = MAC802154_HWSIM_CMD_DEL_RADIO,
615
-		.policy = hwsim_genl_policy,
595
+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
616
596
 		.doit = hwsim_del_radio_nl,
617
597
 		.flags = GENL_UNS_ADMIN_PERM,
618
598
 	},
619
599
 	{
620
600
 		.cmd = MAC802154_HWSIM_CMD_GET_RADIO,
621
-		.policy = hwsim_genl_policy,
601
+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
622
602
 		.doit = hwsim_get_radio_nl,
623
603
 		.dumpit = hwsim_dump_radio_nl,
624
604
 	},
625
605
 	{
626
606
 		.cmd = MAC802154_HWSIM_CMD_NEW_EDGE,
627
-		.policy = hwsim_genl_policy,
607
+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
628
608
 		.doit = hwsim_new_edge_nl,
629
609
 		.flags = GENL_UNS_ADMIN_PERM,
630
610
 	},
631
611
 	{
632
612
 		.cmd = MAC802154_HWSIM_CMD_DEL_EDGE,
633
-		.policy = hwsim_genl_policy,
613
+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
634
614
 		.doit = hwsim_del_edge_nl,
635
615
 		.flags = GENL_UNS_ADMIN_PERM,
636
616
 	},
637
617
 	{
638
618
 		.cmd = MAC802154_HWSIM_CMD_SET_EDGE,
639
-		.policy = hwsim_genl_policy,
619
+		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
640
620
 		.doit = hwsim_set_edge_lqi,
641
621
 		.flags = GENL_UNS_ADMIN_PERM,
642
622
 	},
..
..
@@ -646,9 +626,10 @@
646
626
 	.name = "MAC802154_HWSIM",
647
627
 	.version = 1,
648
628
 	.maxattr = MAC802154_HWSIM_ATTR_MAX,
629
+	.policy = hwsim_genl_policy,
649
630
 	.module = THIS_MODULE,
650
-	.ops = hwsim_nl_ops,
651
-	.n_ops = ARRAY_SIZE(hwsim_nl_ops),
631
+	.small_ops = hwsim_nl_ops,
632
+	.n_small_ops = ARRAY_SIZE(hwsim_nl_ops),
652
633
 	.mcgrps = hwsim_mcgrps,
653
634
 	.n_mcgrps = ARRAY_SIZE(hwsim_mcgrps),
654
635
 };