From b516456cedb66439f33c8878f73bf5dad0223471 Mon Sep 17 00:00:00 2001 From: Fabio Aiuto Date: Mon, 23 Aug 2021 16:12:02 +0200 Subject: [PATCH] staging: rtl8723bs: remove functions notifying wext events remove functions that once were meant to notify wext events to userspace. Now they are donig nothing useful so just remove them. Signed-off-by: Fabio Aiuto Link: https://lore.kernel.org/r/0d745350ff3d411dda329b8c1e2261361570db6e.1629727333.git.fabioaiuto83@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 4 +-- drivers/staging/rtl8723bs/include/drv_types.h | 3 -- drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 38 -------------------------- drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 4 --- 4 files changed, 1 insertion(+), 48 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c index 5f25cbf..eee250f 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +++ b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c @@ -449,10 +449,8 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_s res = true; } else { - if (rtw_is_scan_deny(padapter)) { - indicate_wx_scan_complete_event(padapter); + if (rtw_is_scan_deny(padapter)) return _SUCCESS; - } spin_lock_bh(&pmlmepriv->lock); diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h index 580028d..ae32963 100644 --- a/drivers/staging/rtl8723bs/include/drv_types.h +++ b/drivers/staging/rtl8723bs/include/drv_types.h @@ -495,9 +495,6 @@ static inline u8 *myid(struct eeprom_priv *peepriv) #include -void rtw_indicate_wx_disassoc_event(struct adapter *padapter); -void rtw_indicate_wx_assoc_event(struct adapter *padapter); -void indicate_wx_scan_complete_event(struct adapter *padapter); int rtw_change_ifname(struct adapter *padapter, const char *ifname); extern char *rtw_initmac; diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c index 733c6b9..9d4a233 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c @@ -29,44 +29,6 @@ #define WEXT_CSCAN_HOME_DWELL_SECTION 'H' #define WEXT_CSCAN_TYPE_SECTION 'T' -void indicate_wx_scan_complete_event(struct adapter *padapter) -{ - union iwreq_data wrqu; - - memset(&wrqu, 0, sizeof(union iwreq_data)); -} - - -void rtw_indicate_wx_assoc_event(struct adapter *padapter) -{ - union iwreq_data wrqu; - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; - struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); - struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&(pmlmeinfo->network)); - - memset(&wrqu, 0, sizeof(union iwreq_data)); - - wrqu.ap_addr.sa_family = ARPHRD_ETHER; - - if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true) - memcpy(wrqu.ap_addr.sa_data, pnetwork->mac_address, ETH_ALEN); - else - memcpy(wrqu.ap_addr.sa_data, pmlmepriv->cur_network.network.mac_address, ETH_ALEN); - - netdev_dbg(padapter->pnetdev, "assoc success\n"); -} - -void rtw_indicate_wx_disassoc_event(struct adapter *padapter) -{ - union iwreq_data wrqu; - - memset(&wrqu, 0, sizeof(union iwreq_data)); - - wrqu.ap_addr.sa_family = ARPHRD_ETHER; - eth_zero_addr(wrqu.ap_addr.sa_data); -} - static int wpa_set_auth_algs(struct net_device *dev, u32 value) { struct adapter *padapter = rtw_netdev_priv(dev); diff --git a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c b/drivers/staging/rtl8723bs/os_dep/mlme_linux.c index a4560ba..1341801 100644 --- a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/mlme_linux.c @@ -48,7 +48,6 @@ void rtw_os_indicate_connect(struct adapter *adapter) rtw_cfg80211_indicate_connect(adapter); } - rtw_indicate_wx_assoc_event(adapter); netif_carrier_on(adapter->pnetdev); if (adapter->pid[2] != 0) @@ -58,7 +57,6 @@ void rtw_os_indicate_connect(struct adapter *adapter) void rtw_os_indicate_scan_done(struct adapter *padapter, bool aborted) { rtw_cfg80211_indicate_scan_done(padapter, aborted); - indicate_wx_scan_complete_event(padapter); } static struct rt_pmkid_list backupPMKIDList[NUM_PMKID_CACHE]; @@ -129,8 +127,6 @@ void rtw_os_indicate_disconnect(struct adapter *adapter) rtw_cfg80211_indicate_disconnect(adapter); - rtw_indicate_wx_disassoc_event(adapter); - /* modify for CONFIG_IEEE80211W, none 11w also can use the same command */ rtw_reset_securitypriv_cmd(adapter); } -- 2.7.4