From bedbef8ad3e75a304af6361af235302bcc61d06b Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Tue, 14 May 2024 06:39:01 +0000 Subject: [PATCH] 修改内核路径 --- kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/wl_android_ext.h | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/wl_android_ext.h b/kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/wl_android_ext.h old mode 100644 new mode 100755 index 78ce56d..a8f8862 --- a/kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/wl_android_ext.h +++ b/kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/wl_android_ext.h @@ -1,4 +1,3 @@ -/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _wl_android_ext_ #define _wl_android_ext_ @@ -48,10 +47,9 @@ int wl_ext_iovar_setbuf_bsscfg(struct net_device *dev, s8 *iovar_name, void *param, s32 paramlen, void *buf, s32 buflen, s32 bsscfg_idx, struct mutex* buf_sync); -chanspec_t wl_ext_chspec_driver_to_host(struct dhd_pub *dhd, chanspec_t chanspec); -chanspec_t wl_ext_chspec_host_to_driver(struct dhd_pub *dhd, chanspec_t chanspec); +chanspec_t wl_ext_chspec_driver_to_host(int ioctl_ver, chanspec_t chanspec); +chanspec_t wl_ext_chspec_host_to_driver(int ioctl_ver, chanspec_t chanspec); bool wl_ext_dfs_chan(struct wl_chan_info *chan_info); -bool wl_ext_passive_chan(struct net_device *dev, struct wl_chan_info *chan_info); uint16 wl_ext_get_default_chan(struct net_device *dev, uint16 *chan_2g, uint16 *chan_5g, bool nodfs); int wl_ext_set_chanspec(struct net_device *dev, struct wl_chan_info *chan_info, @@ -60,6 +58,11 @@ #endif #if defined(WL_CFG80211) || defined(WL_ESCAN) void wl_ext_user_sync(struct dhd_pub *dhd, int ifidx, bool lock); +#endif +#if defined(WL_CFG80211) +bool wl_legacy_chip_check(struct net_device *net); +bool wl_new_chip_check(struct net_device *net); +bool wl_extsae_chip(struct dhd_pub *dhd); #endif #if defined(WL_EXT_IAPSTA) || defined(WL_CFG80211) void wl_ext_bss_iovar_war(struct net_device *dev, s32 *val); @@ -175,16 +178,16 @@ #else wl_scan_results_v109_t *bss_list, #endif - int *best_2g_ch, int *best_5g_ch, int *best_6g_ch + int ioctl_ver, int *best_2g_ch, int *best_5g_ch, int *best_6g_ch ); #ifdef WL_6G_BAND -#define CHSPEC2BANDSTR(chspec) ((chspec && CHSPEC_IS2G(chspec)) ? "2g" : CHSPEC_IS5G(chspec) ? \ +#define CHSPEC2BANDSTR(chspec) (CHSPEC_IS2G(chspec) ? "2g" : CHSPEC_IS5G(chspec) ? \ "5g" : CHSPEC_IS6G(chspec) ? "6g" : "0g") #define WLCBAND2STR(band) ((band == WLC_BAND_2G) ? "2g" : (band == WLC_BAND_5G) ? \ "5g" : (band == WLC_BAND_6G) ? "6g" : "0g") #else -#define CHSPEC2BANDSTR(chspec) ((chspec && CHSPEC_IS2G(chspec)) ? "2g" : CHSPEC_IS5G(chspec) ? \ +#define CHSPEC2BANDSTR(chspec) (CHSPEC_IS2G(chspec) ? "2g" : CHSPEC_IS5G(chspec) ? \ "5g" : "0g") #define WLCBAND2STR(band) ((band == WLC_BAND_2G) ? "2g" : (band == WLC_BAND_5G) ? \ "5g" : "0g") -- Gitblit v1.6.2