staging: r8188eu: remove HW_VAR_BSSID from SetHwReg8188EU()

Remove the HW_VAR_BSSID case from SetHwReg8188EU() and move its
functionality to rtw_mlme_ext.c where it is actually used. This is
part of the ongoing effort to get rid of the unwanted hal layer.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220402092332.6627-2-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index be81a01e5fb8d495902f9ca402d7c4f7c33ac535..2c073219c13fa9ace29b1711bbb987c4f3597d6e 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -6096,6 +6096,14 @@ u8 collect_bss_info(struct adapter *padapter, struct recv_frame *precv_frame, st
        return _SUCCESS;
 }
 
+static void rtw_set_bssid(struct adapter *adapter, u8 *bssid)
+{
+       int i;
+
+       for (i = 0; i < ETH_ALEN; i++)
+               rtw_write8(adapter, REG_BSSID + i, bssid[i]);
+}
+
 void start_create_ibss(struct adapter *padapter)
 {
        unsigned short  caps;
@@ -6130,7 +6138,7 @@ void start_create_ibss(struct adapter *padapter)
                        report_join_res(padapter, -1);
                        pmlmeinfo->state = WIFI_FW_NULL_STATE;
                } else {
-                       SetHwReg8188EU(padapter, HW_VAR_BSSID, padapter->registrypriv.dev_network.MacAddress);
+                       rtw_set_bssid(padapter, padapter->registrypriv.dev_network.MacAddress);
                        join_type = 0;
                        SetHwReg8188EU(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type));
 
@@ -6711,7 +6719,7 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)
        if (join_res < 0) {
                join_type = 1;
                SetHwReg8188EU(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type));
-               SetHwReg8188EU(padapter, HW_VAR_BSSID, null_addr);
+               rtw_set_bssid(padapter, null_addr);
 
                /* restore to initial setting. */
                update_tx_basic_rate(padapter, padapter->registrypriv.wireless_mode);
@@ -6830,7 +6838,7 @@ void mlmeext_sta_del_event_callback(struct adapter *padapter)
 
        if (is_client_associated_to_ap(padapter) || is_IBSS_empty(padapter)) {
                mlme_disconnect(padapter);
-               SetHwReg8188EU(padapter, HW_VAR_BSSID, null_addr);
+               rtw_set_bssid(padapter, null_addr);
 
                /* restore to initial setting. */
                update_tx_basic_rate(padapter, padapter->registrypriv.wireless_mode);
@@ -7266,7 +7274,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf)
 
        /* config the initial gain under linking, need to write the BB registers */
 
-       SetHwReg8188EU(padapter, HW_VAR_BSSID, pmlmeinfo->network.MacAddress);
+       rtw_set_bssid(padapter, pmlmeinfo->network.MacAddress);
        join_type = 0;
        SetHwReg8188EU(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type));
 
@@ -7290,7 +7298,7 @@ u8 disconnect_hdl(struct adapter *padapter, unsigned char *pbuf)
                issue_deauth_ex(padapter, pnetwork->MacAddress, WLAN_REASON_DEAUTH_LEAVING, param->deauth_timeout_ms / 100, 100);
 
        mlme_disconnect(padapter);
-       SetHwReg8188EU(padapter, HW_VAR_BSSID, null_addr);
+       rtw_set_bssid(padapter, null_addr);
 
        /* restore to initial setting. */
        update_tx_basic_rate(padapter, padapter->registrypriv.wireless_mode);

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 6b4b0b0c4f530d1fdde5c35416a41aa79ac2d6ce..cf34645b3de5345316f7fe51ff43cc38d0c13626 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -942,17 +942,6 @@ static void hw_var_set_opmode(struct adapter *Adapter, u8 *val)
        }
 }
 
-static void hw_var_set_bssid(struct adapter *Adapter, u8 *val)
-{
-       u8 idx = 0;
-       u32 reg_bssid;
-
-       reg_bssid = REG_BSSID;
-
-       for (idx = 0; idx < 6; idx++)
-               rtw_write8(Adapter, (reg_bssid + idx), val[idx]);
-}
-
 void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
 {
        struct hal_data_8188e *haldata = &Adapter->haldata;
@@ -963,9 +952,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
        case HW_VAR_SET_OPMODE:
                hw_var_set_opmode(Adapter, val);
                break;
-       case HW_VAR_BSSID:
-               hw_var_set_bssid(Adapter, val);
-               break;
        case HW_VAR_BASIC_RATE:
                {
                        u16 BrateCfg = 0;

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 9b465001975cc22631353161c010c45a5ccd18c0..591322c20f7d2253f8fb0e73328499efd1e6376c 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -10,7 +10,6 @@
 
 enum hw_variables {
        HW_VAR_SET_OPMODE,
-       HW_VAR_BSSID,
        HW_VAR_BASIC_RATE,
        HW_VAR_CORRECT_TSF,
        HW_VAR_MLME_SITESURVEY,