Commit 409b47c4 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

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



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent efc7144f

drivers/staging/rtl8723au/core/rtw_ap.c

+0 −18
Original line number Diff line number Diff line
@@ -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;

drivers/staging/rtl8723au/core/rtw_mlme.c

+0 −27
Original line number Diff line number Diff line
@@ -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."

drivers/staging/rtl8723au/core/rtw_mlme_ext.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

drivers/staging/rtl8723au/include/wlan_bssdef.h

+0 −9
Original line number Diff line number Diff line
@@ -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];