add stmac read mac form eeprom

hc

2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c

 kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/wl_android_ext.h
old mode 100644new mode 100755
..
..
@@ -1,4 +1,3 @@
1
-/* SPDX-License-Identifier: GPL-2.0 */
2
1
 
3
2
 #ifndef _wl_android_ext_
4
3
 #define _wl_android_ext_
..
..
@@ -48,10 +47,9 @@
48
47
 int wl_ext_iovar_setbuf_bsscfg(struct net_device *dev, s8 *iovar_name,
49
48
 	void *param, s32 paramlen, void *buf, s32 buflen, s32 bsscfg_idx,
50
49
 	struct mutex* buf_sync);
51
-chanspec_t wl_ext_chspec_driver_to_host(struct dhd_pub *dhd, chanspec_t chanspec);
52
-chanspec_t wl_ext_chspec_host_to_driver(struct dhd_pub *dhd, chanspec_t chanspec);
50
+chanspec_t wl_ext_chspec_driver_to_host(int ioctl_ver, chanspec_t chanspec);
51
+chanspec_t wl_ext_chspec_host_to_driver(int ioctl_ver, chanspec_t chanspec);
53
52
 bool wl_ext_dfs_chan(struct wl_chan_info *chan_info);
54
-bool wl_ext_passive_chan(struct net_device *dev, struct wl_chan_info *chan_info);
55
53
 uint16 wl_ext_get_default_chan(struct net_device *dev,
56
54
 	uint16 *chan_2g, uint16 *chan_5g, bool nodfs);
57
55
 int wl_ext_set_chanspec(struct net_device *dev, struct wl_chan_info *chan_info,
..
..
@@ -60,6 +58,11 @@
60
58
 #endif
61
59
 #if defined(WL_CFG80211) || defined(WL_ESCAN)
62
60
 void wl_ext_user_sync(struct dhd_pub *dhd, int ifidx, bool lock);
61
+#endif
62
+#if defined(WL_CFG80211)
63
+bool wl_legacy_chip_check(struct net_device *net);
64
+bool wl_new_chip_check(struct net_device *net);
65
+bool wl_extsae_chip(struct dhd_pub *dhd);
63
66
 #endif
64
67
 #if defined(WL_EXT_IAPSTA) || defined(WL_CFG80211)
65
68
 void wl_ext_bss_iovar_war(struct net_device *dev, s32 *val);
..
..
@@ -175,16 +178,16 @@
175
178
 #else
176
179
 	wl_scan_results_v109_t *bss_list,
177
180
 #endif
178
-	int *best_2g_ch, int *best_5g_ch, int *best_6g_ch
181
+	int ioctl_ver, int *best_2g_ch, int *best_5g_ch, int *best_6g_ch
179
182
 );
180
183
 
181
184
 #ifdef WL_6G_BAND
182
-#define CHSPEC2BANDSTR(chspec) ((chspec && CHSPEC_IS2G(chspec)) ? "2g" : CHSPEC_IS5G(chspec) ? \
185
+#define CHSPEC2BANDSTR(chspec) (CHSPEC_IS2G(chspec) ? "2g" : CHSPEC_IS5G(chspec) ? \
183
186
 	"5g" : CHSPEC_IS6G(chspec) ? "6g" : "0g")
184
187
 #define WLCBAND2STR(band) ((band == WLC_BAND_2G) ? "2g" : (band == WLC_BAND_5G) ? \
185
188
 	"5g" : (band == WLC_BAND_6G) ? "6g" : "0g")
186
189
 #else
187
-#define CHSPEC2BANDSTR(chspec) ((chspec && CHSPEC_IS2G(chspec)) ? "2g" : CHSPEC_IS5G(chspec) ? \
190
+#define CHSPEC2BANDSTR(chspec) (CHSPEC_IS2G(chspec) ? "2g" : CHSPEC_IS5G(chspec) ? \
188
191
 	"5g" : "0g")
189
192
 #define WLCBAND2STR(band) ((band == WLC_BAND_2G) ? "2g" : (band == WLC_BAND_5G) ? \
190
193
 	"5g" : "0g")