From 588a510278e13b5eeb379797c22956e39ea183ac Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Tue, 18 Jul 2023 18:53:01 +0200 Subject: [PATCH 150/464] 8723cs: Fix symbol conflicts with rtw88 driver Signed-off-by: Ondrej Jirman --- drivers/staging/rtl8723cs/hal/hal_com.c | 2 +- drivers/staging/rtl8723cs/include/hal_com.h | 2 +- drivers/staging/rtl8723cs/os_dep/linux/ioctl_cfg80211.c | 2 +- drivers/staging/rtl8723cs/os_dep/linux/wifi_regd.c | 2 +- drivers/staging/rtl8723cs/os_dep/linux/wifi_regd.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8723cs/hal/hal_com.c b/drivers/staging/rtl8723cs/hal/hal_com.c index a0f15958a778..94728558b50a 100644 --- a/drivers/staging/rtl8723cs/hal/hal_com.c +++ b/drivers/staging/rtl8723cs/hal/hal_com.c @@ -2318,7 +2318,7 @@ u32 rtw_sec_read_cam(_adapter *adapter, u8 addr) return rdata; } -void rtw_sec_write_cam(_adapter *adapter, u8 addr, u32 wdata) +static void rtw_sec_write_cam(_adapter *adapter, u8 addr, u32 wdata) { _mutex *mutex = &adapter_to_dvobj(adapter)->cam_ctl.sec_cam_access_mutex; u32 cnt = 0; diff --git a/drivers/staging/rtl8723cs/include/hal_com.h b/drivers/staging/rtl8723cs/include/hal_com.h index dcafbafd8b1b..ea3b94fce7b1 100644 --- a/drivers/staging/rtl8723cs/include/hal_com.h +++ b/drivers/staging/rtl8723cs/include/hal_com.h @@ -386,7 +386,7 @@ void rtw_hal_update_sta_ra_info(PADAPTER padapter, struct sta_info *psta); /* access HW only */ u32 rtw_sec_read_cam(_adapter *adapter, u8 addr); -void rtw_sec_write_cam(_adapter *adapter, u8 addr, u32 wdata); +//void rtw_sec_write_cam(_adapter *adapter, u8 addr, u32 wdata); void rtw_sec_read_cam_ent(_adapter *adapter, u8 id, u8 *ctrl, u8 *mac, u8 *key); void rtw_sec_write_cam_ent(_adapter *adapter, u8 id, u16 ctrl, u8 *mac, u8 *key); void rtw_sec_clr_cam_ent(_adapter *adapter, u8 id); diff --git a/drivers/staging/rtl8723cs/os_dep/linux/ioctl_cfg80211.c b/drivers/staging/rtl8723cs/os_dep/linux/ioctl_cfg80211.c index 7eea58711252..e170700f3ae0 100644 --- a/drivers/staging/rtl8723cs/os_dep/linux/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723cs/os_dep/linux/ioctl_cfg80211.c @@ -10531,7 +10531,7 @@ int rtw_wiphy_register(struct wiphy *wiphy) rtw_cfgvendor_attach(wiphy); #endif - rtw_regd_init(wiphy); + rtw_regd_init_8723cs(wiphy); return wiphy_register(wiphy); } diff --git a/drivers/staging/rtl8723cs/os_dep/linux/wifi_regd.c b/drivers/staging/rtl8723cs/os_dep/linux/wifi_regd.c index b4b0bcd5114d..bad1545640e3 100644 --- a/drivers/staging/rtl8723cs/os_dep/linux/wifi_regd.c +++ b/drivers/staging/rtl8723cs/os_dep/linux/wifi_regd.c @@ -389,7 +389,7 @@ static int rtw_reg_notifier_return(struct wiphy *wiphy, struct regulatory_reques } #endif -int rtw_regd_init(struct wiphy *wiphy) +int rtw_regd_init_8723cs(struct wiphy *wiphy) { #if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)) wiphy->reg_notifier = rtw_reg_notifier_return; diff --git a/drivers/staging/rtl8723cs/os_dep/linux/wifi_regd.h b/drivers/staging/rtl8723cs/os_dep/linux/wifi_regd.h index 4e147fc51dbc..b9f6d0d7b4ef 100644 --- a/drivers/staging/rtl8723cs/os_dep/linux/wifi_regd.h +++ b/drivers/staging/rtl8723cs/os_dep/linux/wifi_regd.h @@ -22,6 +22,6 @@ struct _RT_CHANNEL_INFO; u8 rtw_os_init_channel_set(_adapter *padapter, struct _RT_CHANNEL_INFO *channel_set); s16 rtw_os_get_total_txpwr_regd_lmt_mbm(_adapter *adapter, u8 cch, enum channel_width bw); #endif -int rtw_regd_init(struct wiphy *wiphy); +int rtw_regd_init_8723cs(struct wiphy *wiphy); #endif /* __WIFI_REGD_H__ */ -- 2.34.1