staging: rtl8723bs: core: remove unneeded variable

Below are the changes:

Remove unneeded variable "u8 *pbuf" from function start_bss_network
argument as this can be get from first argument "padapter"

Remove the struct wlan_bssid_ex *network from createbss_hdl function
as this is only used to pass as second argument to start_bss_network()

Remove the struct mlme_priv *mlmepriv from rtw_ap_restore_network
function as this is only used to pass as second argument
to start_bss_network()

Signed-off-by: Saurav Girepunje <saurav.girepunje@google.com>
Link: https://lore.kernel.org/r/20210428154011.GA5571@user
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c
index 4a9bd4825fab93c006ad8e716cd91249a0e89c65..dc8f029e8b7f76e85fdba0a8263283c3b1a0feb8 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_ap.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
@@ -653,7 +653,7 @@ static void update_hw_ht_param(struct adapter *padapter)
        /* pmlmeinfo->HT_protection = pmlmeinfo->HT_info.infos[1] & 0x3; */
 }
 
-void start_bss_network(struct adapter *padapter, u8 *pbuf)
+void start_bss_network(struct adapter *padapter)
 {
        u8 *p;
        u8 val8, cur_channel, cur_bwmode, cur_ch_offset;
@@ -2039,7 +2039,6 @@ void ap_sta_info_defer_update(struct adapter *padapter, struct sta_info *psta)
 /* restore hw setting from sw data structures */
 void rtw_ap_restore_network(struct adapter *padapter)
 {
-       struct mlme_priv *mlmepriv = &padapter->mlmepriv;
        struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
        struct sta_priv *pstapriv = &padapter->stapriv;
        struct sta_info *psta;
@@ -2058,7 +2057,7 @@ void rtw_ap_restore_network(struct adapter *padapter)
                pmlmeext->cur_bwmode
        );
 
-       start_bss_network(padapter, (u8 *)&mlmepriv->cur_network.network);
+       start_bss_network(padapter);
 
        if ((padapter->securitypriv.dot11PrivacyAlgrthm == _TKIP_) ||
                (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_)) {

diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index 75db4272e537eea8a00a061a45923f31e0d58f4c..3ed996bba98e5a836809a42f38c9bd79817a99f1 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -669,7 +669,7 @@ int rtw_startbss_cmd(struct adapter  *padapter, int flags)
 
        if (flags & RTW_CMDF_DIRECTLY) {
                /* no need to enqueue, do the cmd hdl directly and free cmd parameter */
-               start_bss_network(padapter, (u8 *)&(padapter->mlmepriv.cur_network.network));
+               start_bss_network(padapter);
        } else {
                /* need enqueue, prepare cmd_obj and enqueue */
                pcmd = rtw_zmalloc(sizeof(struct cmd_obj));

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index a2fdd5ea5fc4143f978e593a34d7528f70460a0e..1ff24f37022abc7db0701de8f9266c4d28c231a6 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -5455,9 +5455,7 @@ u8 createbss_hdl(struct adapter *padapter, u8 *pbuf)
        /* u32 initialgain; */
 
        if (pmlmeinfo->state == WIFI_FW_AP_STATE) {
-               struct wlan_bssid_ex *network = &padapter->mlmepriv.cur_network.network;
-
-               start_bss_network(padapter, (u8 *)network);
+               start_bss_network(padapter);
                return H2C_SUCCESS;
        }
 

diff --git a/drivers/staging/rtl8723bs/include/rtw_ap.h b/drivers/staging/rtl8723bs/include/rtw_ap.h
index 4a1ed9eff83a66b4c48e2244140ee7cc91c3a17e..7a735e691399c8ccf3b68fdbb0689896e774a05c 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_ap.h
+++ b/drivers/staging/rtl8723bs/include/rtw_ap.h
@@ -14,7 +14,7 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx);
 void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level);
 void expire_timeout_chk(struct adapter *padapter);
 void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta);
-void start_bss_network(struct adapter *padapter, u8 *pbuf);
+void start_bss_network(struct adapter *padapter);
 int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf,  int len);
 void rtw_ap_restore_network(struct adapter *padapter);
 void rtw_set_macaddr_acl(struct adapter *padapter, int mode);