staging: rtl8723au: Get rid of write only NetworkTypeInUse and matching enum

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/core/rtw_ap.c b/drivers/staging/rtl8723au/core/rtw_ap.c
index 5847fc5f6f36c4736e5335ad18fd1343253b391d..f71e55a647fb9020802728dfb972ebee702d9c90 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_ap.c
+++ b/drivers/staging/rtl8723au/core/rtw_ap.c
@@ -1008,24 +1008,6 @@ int rtw_check_beacon_data23a(struct rtw_adapter *padapter, u8 *pbuf,
        if (p && ie_len > 0)
                pHT_info_ie = p;
 
-       switch (network_type) {
-       case WIRELESS_11B:
-               pbss_network->NetworkTypeInUse = Ndis802_11DS;
-               break;
-       case WIRELESS_11G:
-       case WIRELESS_11BG:
-            case WIRELESS_11G_24N:
-       case WIRELESS_11BG_24N:
-               pbss_network->NetworkTypeInUse = Ndis802_11OFDM24;
-               break;
-       case WIRELESS_11A:
-               pbss_network->NetworkTypeInUse = Ndis802_11OFDM5;
-               break;
-       default :
-               pbss_network->NetworkTypeInUse = Ndis802_11OFDM24;
-               break;
-       }
-
        pmlmepriv->cur_network.network_type = network_type;
 
        pmlmepriv->htpriv.ht_option = false;

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
index b5e548e8fa80802b6fd16981748eddc2914a1fbc..b912d09d6550d5a39ae1bb2081e9c044e500327a 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
@@ -2146,33 +2146,6 @@ void rtw_update_registrypriv_dev_network23a(struct rtw_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;
-       case WIRELESS_11A:
-       case WIRELESS_11A_5N:
-               pdev_network->NetworkTypeInUse = Ndis802_11OFDM5;
-               break;
-       case WIRELESS_11ABGN:
-               if (pregistrypriv->channel > 14)
-                       pdev_network->NetworkTypeInUse = Ndis802_11OFDM5;
-               else
-                       pdev_network->NetworkTypeInUse = Ndis802_11OFDM24;
-               break;
-       default :
-               /*  TODO */
-               break;
-       }
-
        pdev_network->Configuration.DSConfig = pregistrypriv->channel;
        RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
                 ("pregistrypriv->channel =%d, pdev_network->Configuration."

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
index aaf4fd0e129ed4e9489efccbfbed2a2b04600109..0bfc91fe034f22743b09ed1ee86c79139472300d 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
@@ -4564,8 +4564,6 @@ int collect_bss_info23a(struct rtw_adapter *padapter,
                memcpy(bssid->SupportedRates + i, p + 2, p[1]);
        }
 
-       bssid->NetworkTypeInUse = Ndis802_11OFDM24;
-
        if (bssid->IELength < 12)
                return _FAIL;
 

diff --git a/drivers/staging/rtl8723au/include/wlan_bssdef.h b/drivers/staging/rtl8723au/include/wlan_bssdef.h
index 0799d800c69921e4fb84161f51f714776310becb..e6b225c7d5d5c54e48395f1fa5d76ce8d9ae60a6 100644 (file)
--- a/drivers/staging/rtl8723au/include/wlan_bssdef.h
+++ b/drivers/staging/rtl8723au/include/wlan_bssdef.h
@@ -22,14 +22,6 @@
 #define NDIS_802_11_LENGTH_RATES        8
 #define NDIS_802_11_LENGTH_RATES_EX     16
 
-enum ndis_802_11_net_type {
-       Ndis802_11FH,
-       Ndis802_11DS,
-       Ndis802_11OFDM5,
-       Ndis802_11OFDM24,
-       Ndis802_11NetworkTypeMax    /*  just an upper bound */
-};
-
 struct ndis_802_11_configuration_fh {
        u32           Length;             /*  Length of structure */
        u32           HopPattern;         /*  As defined by 802.11, MSB set */
@@ -158,7 +150,6 @@ struct wlan_bssid_ex {
        struct cfg80211_ssid Ssid;
        u32  Privacy;
        long  Rssi;/* in dBM, raw data , get from PHY) */
-       enum ndis_802_11_net_type  NetworkTypeInUse;
        struct ndis_802_11_config  Configuration;
        enum nl80211_iftype ifmode;
        unsigned char SupportedRates[NDIS_802_11_LENGTH_RATES_EX];