修改4g拨号为QMI,需要在系统里后台执行quectel-CM

hc

2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5

 kernel/net/bridge/br_vlan_tunnel.c
..
..
@@ -1,13 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  *	Bridge per vlan tunnel port dst_metadata handling code
3
4
  *
4
5
  *	Authors:
5
6
  *	Roopa Prabhu		<roopa@cumulusnetworks.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
- *	as published by the Free Software Foundation; either version
10
- *	2 of the License, or (at your option) any later version.
11
7
  */
12
8
 
13
9
 #include <linux/kernel.h>
..
..
@@ -34,7 +30,6 @@
34
30
 	.key_offset = offsetof(struct net_bridge_vlan, tinfo.tunnel_id),
35
31
 	.key_len = sizeof(__be64),
36
32
 	.nelem_hint = 3,
37
-	.locks_mul = 1,
38
33
 	.obj_cmpfn = br_vlan_tunid_cmp,
39
34
 	.automatic_shrinking = true,
40
35
 };
..
..
@@ -99,7 +94,8 @@
99
94
 /* Must be protected by RTNL.
100
95
  * Must be called with vid in range from 1 to 4094 inclusive.
101
96
  */
102
-int nbp_vlan_tunnel_info_add(struct net_bridge_port *port, u16 vid, u32 tun_id)
97
+int nbp_vlan_tunnel_info_add(const struct net_bridge_port *port, u16 vid,
98
+			     u32 tun_id)
103
99
 {
104
100
 	struct net_bridge_vlan_group *vg;
105
101
 	struct net_bridge_vlan *vlan;
..
..
@@ -117,7 +113,7 @@
117
113
 /* Must be protected by RTNL.
118
114
  * Must be called with vid in range from 1 to 4094 inclusive.
119
115
  */
120
-int nbp_vlan_tunnel_info_delete(struct net_bridge_port *port, u16 vid)
116
+int nbp_vlan_tunnel_info_delete(const struct net_bridge_port *port, u16 vid)
121
117
 {
122
118
 	struct net_bridge_vlan_group *vg;
123
119
 	struct net_bridge_vlan *v;