rtl88x2CE_WiFi_linux add concurrent mode

hc

2024-09-20 cf4ce59b3b70238352c7f1729f0f7223214828ad

 kernel/net/mac80211/mesh.h
..
..
@@ -1,11 +1,8 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
1
2
 /*
2
3
  * Copyright (c) 2008, 2009 open80211s Ltd.
3
4
  * Authors:    Luis Carlos Cobo <luisca@cozybit.com>
4
5
  *             Javier Cardona <javier@cozybit.com>
5
- *
6
- * This program is free software; you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License version 2 as
8
- * published by the Free Software Foundation.
9
6
  */
10
7
 
11
8
 #ifndef IEEE80211S_H
..
..
@@ -95,6 +92,7 @@
95
92
  * @last_preq_to_root: Timestamp of last PREQ sent to root
96
93
  * @is_root: the destination station of this path is a root node
97
94
  * @is_gate: the destination station of this path is a mesh gate
95
+ * @path_change_count: the number of path changes to destination
98
96
  *
99
97
  *
100
98
  * The dst address is unique in the mesh path table. Since the mesh_path is
..
..
@@ -126,26 +124,7 @@
126
124
 	unsigned long last_preq_to_root;
127
125
 	bool is_root;
128
126
 	bool is_gate;
129
-};
130
-
131
-/**
132
- * struct mesh_table
133
- *
134
- * @known_gates: list of known mesh gates and their mpaths by the station. The
135
- * gate's mpath may or may not be resolved and active.
136
- * @gates_lock: protects updates to known_gates
137
- * @rhead: the rhashtable containing struct mesh_paths, keyed by dest addr
138
- * @walk_head: linked list containging all mesh_path objects
139
- * @walk_lock: lock protecting walk_head
140
- * @entries: number of entries in the table
141
- */
142
-struct mesh_table {
143
-	struct hlist_head known_gates;
144
-	spinlock_t gates_lock;
145
-	struct rhashtable rhead;
146
-	struct hlist_head walk_head;
147
-	spinlock_t walk_lock;
148
-	atomic_t entries;		/* Up to MAX_MESH_NEIGHBOURS */
127
+	u32 path_change_count;
149
128
 };
150
129
 
151
130
 /* Recent multicast cache */
..
..
@@ -219,6 +198,12 @@
219
198
 			struct sk_buff *skb);
220
199
 int mesh_add_vht_oper_ie(struct ieee80211_sub_if_data *sdata,
221
200
 			 struct sk_buff *skb);
201
+int mesh_add_he_cap_ie(struct ieee80211_sub_if_data *sdata,
202
+		       struct sk_buff *skb, u8 ie_len);
203
+int mesh_add_he_oper_ie(struct ieee80211_sub_if_data *sdata,
204
+			struct sk_buff *skb);
205
+int mesh_add_he_6ghz_cap_ie(struct ieee80211_sub_if_data *sdata,
206
+			    struct sk_buff *skb);
222
207
 void mesh_rmc_free(struct ieee80211_sub_if_data *sdata);
223
208
 int mesh_rmc_init(struct ieee80211_sub_if_data *sdata);
224
209
 void ieee80211s_init(void);
..
..
@@ -276,10 +261,13 @@
276
261
 int mesh_path_add_gate(struct mesh_path *mpath);
277
262
 int mesh_path_send_to_gates(struct mesh_path *mpath);
278
263
 int mesh_gate_num(struct ieee80211_sub_if_data *sdata);
264
+u32 airtime_link_metric_get(struct ieee80211_local *local,
265
+			    struct sta_info *sta);
279
266
 
280
267
 /* Mesh plinks */
281
268
 void mesh_neighbour_update(struct ieee80211_sub_if_data *sdata,
282
-			   u8 *hw_addr, struct ieee802_11_elems *ie);
269
+			   u8 *hw_addr, struct ieee802_11_elems *ie,
270
+			   struct ieee80211_rx_status *rx_status);
283
271
 bool mesh_peer_accepts_plinks(struct ieee802_11_elems *ie);
284
272
 u32 mesh_accept_plinks_update(struct ieee80211_sub_if_data *sdata);
285
273
 void mesh_plink_timer(struct timer_list *t);
..
..
@@ -300,7 +288,7 @@
300
288
 void mesh_path_assign_nexthop(struct mesh_path *mpath, struct sta_info *sta);
301
289
 void mesh_path_flush_pending(struct mesh_path *mpath);
302
290
 void mesh_path_tx_pending(struct mesh_path *mpath);
303
-int mesh_pathtbl_init(struct ieee80211_sub_if_data *sdata);
291
+void mesh_pathtbl_init(struct ieee80211_sub_if_data *sdata);
304
292
 void mesh_pathtbl_unregister(struct ieee80211_sub_if_data *sdata);
305
293
 int mesh_path_del(struct ieee80211_sub_if_data *sdata, const u8 *addr);
306
294
 void mesh_path_timer(struct timer_list *t);