staging: r8188eu: NetworkTypeInUse is not in use

NetworkTypeInUse from struct wlan_bssid_ex is not used. Remove
NetworkTypeInUse itself, the code to set it and the enum for its
possible values.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Link: https://lore.kernel.org/r/20221023170808.46233-4-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index 1f69e5c57d5d596dbd2c5470a9617498e7e26d32..a47ae33454b3d5159e031008405aaee0effe4062 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -1819,22 +1819,6 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter)
 
        pdev_network->Rssi = 0;
 
-       switch (pregistrypriv->wireless_mode) {
-       case WIRELESS_11B:
-               pdev_network->NetworkTypeInUse = (Ndis802_11DS);
-               break;
-       case WIRELESS_11G:
-       case WIRELESS_11BG:
-       case WIRELESS_11_24N:
-       case WIRELESS_11G_24N:
-       case WIRELESS_11BG_24N:
-               pdev_network->NetworkTypeInUse = (Ndis802_11OFDM24);
-               break;
-       default:
-               /*  TODO */
-               break;
-       }
-
        pdev_network->Configuration.DSConfig = (pregistrypriv->channel);
 
        if (cur_network->network.InfrastructureMode == Ndis802_11IBSS)

diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 6c71fbfec32d12cd3b085319a7acd0e46b6d1e1c..fc37d17f8c7e9cb4fc322b5d4dfb7a1f4ef01ac2 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -6160,9 +6160,6 @@ u8 collect_bss_info(struct adapter *padapter, struct recv_frame *precv_frame, st
                memcpy(bssid->SupportedRates + i, (p + 2), len);
        }
 
-       /* todo: */
-       bssid->NetworkTypeInUse = Ndis802_11OFDM24;
-
        if (bssid->IELength < 12)
                return _FAIL;
 

diff --git a/drivers/staging/r8188eu/include/wlan_bssdef.h b/drivers/staging/r8188eu/include/wlan_bssdef.h
index 81bda91a4136bab4eb32aa32113044b5f0f3d98c..831c465df5001aa3f7394bcbee8efb5632979128 100644 (file)
--- a/drivers/staging/r8188eu/include/wlan_bssdef.h
+++ b/drivers/staging/r8188eu/include/wlan_bssdef.h
@@ -17,14 +17,6 @@ struct ndis_802_11_ssid {
        u8  Ssid[32];
 };
 
-enum NDIS_802_11_NETWORK_TYPE {
-       Ndis802_11FH,
-       Ndis802_11DS,
-       Ndis802_11OFDM5,
-       Ndis802_11OFDM24,
-       Ndis802_11NetworkTypeMax    /*  dummy upper bound */
-};
-
 struct ndis_802_11_config_fh {
        u32           Length;           /*  Length of structure */
        u32           HopPattern;       /*  As defined by 802.11, MSB set */
@@ -233,7 +225,6 @@ struct wlan_bssid_ex {
        struct ndis_802_11_ssid  Ssid;
        u32  Privacy;
        NDIS_802_11_RSSI  Rssi;/* in dBM,raw data ,get from PHY) */
-       enum  NDIS_802_11_NETWORK_TYPE  NetworkTypeInUse;
        struct ndis_802_11_config  Configuration;
        enum ndis_802_11_network_infra  InfrastructureMode;
        unsigned char SupportedRates[NDIS_802_11_LENGTH_RATES_EX];