Commit 1fee0cc9 authored by Fabio M. De Francesco's avatar Fabio M. De Francesco Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: Remove all 5GHz network types 



Remove all 5Ghz network types. r8188eu works on
802.11bgn standards and on 2.4Ghz band.

Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarFabio M. De Francesco <fmdefrancesco@gmail.com>
Link: https://lore.kernel.org/r/20210812002519.23678-2-fmdefrancesco@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e7dd1a58

drivers/staging/r8188eu/core/rtw_ap.c

+2 −11
Original line number Diff line number Diff line
@@ -460,11 +460,7 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level) 
	}



	if (pcur_network->Configuration.DSConfig > 14) {

		/*  5G band */

		if (tx_ra_bitmap & 0xffff000)

			sta_band |= WIRELESS_11_5N | WIRELESS_11A;

		else

			sta_band |= WIRELESS_11A;

		sta_band |= WIRELESS_INVALID;

	} else {

		if (tx_ra_bitmap & 0xffff000)

			sta_band |= WIRELESS_11_24N | WIRELESS_11G | WIRELESS_11B;
@@ -547,9 +543,7 @@ void update_bmc_sta(struct adapter *padapter) 
		}



		if (pcur_network->Configuration.DSConfig > 14) {

			/* force to A mode. 5G doesn't support CCK rates */

			network_type = WIRELESS_11A;

			tx_ra_bitmap = 0x150; /*  6, 12, 24 Mbps */

			network_type = WIRELESS_INVALID;

		} else {

			/* force to b mode */

			network_type = WIRELESS_11B;
@@ -1050,9 +1044,6 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
	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;

drivers/staging/r8188eu/core/rtw_ieee80211.c

+3 −16
Original line number Diff line number Diff line
@@ -98,10 +98,7 @@ uint rtw_is_cckratesonly_included(u8 *rate) 
int rtw_check_network_type(unsigned char *rate, int ratelen, int channel)

{

	if (channel > 14) {

		if ((rtw_is_cckrates_included(rate)) == true)

		return WIRELESS_INVALID;

		else

			return WIRELESS_11A;

	} else {  /*  could be pure B, pure G, or B/G */

		if ((rtw_is_cckratesonly_included(rate)) == true)

			return WIRELESS_11B;
@@ -328,9 +325,6 @@ void rtw_set_supported_rate(u8 *SupportedRates, uint mode) 
		memcpy(SupportedRates, WIFI_CCKRATES, IEEE80211_CCK_RATE_LEN);

		break;

	case WIRELESS_11G:

	case WIRELESS_11A:

	case WIRELESS_11_5N:

	case WIRELESS_11A_5N:/* Todo: no basic rate for ofdm ? */

		memcpy(SupportedRates, WIFI_OFDMRATES, IEEE80211_NUM_OFDM_RATESLEN);

		break;

	case WIRELESS_11BG:
@@ -393,14 +387,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv) 
	ie = rtw_set_ie(ie, _SSID_IE_, pdev_network->Ssid.SsidLength, pdev_network->Ssid.Ssid, &sz);



	/* supported rates */

	if (pregistrypriv->wireless_mode == WIRELESS_11ABGN) {

		if (pdev_network->Configuration.DSConfig > 14)

			wireless_mode = WIRELESS_11A_5N;

		else

			wireless_mode = WIRELESS_11BG_24N;

	} else {

	wireless_mode = pregistrypriv->wireless_mode;

	}



	rtw_set_supported_rate(pdev_network->SupportedRates, wireless_mode);

drivers/staging/r8188eu/core/rtw_ioctl_set.c

+1 −1
Original line number Diff line number Diff line
@@ -795,7 +795,7 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter) 
	    (!check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)))

		return 0;



	if (pmlmeext->cur_wireless_mode & (WIRELESS_11_24N|WIRELESS_11_5N)) {

	if (pmlmeext->cur_wireless_mode & (WIRELESS_11_24N)) {

		p = rtw_get_ie(&pcur_bss->IEs[12], _HT_CAPABILITY_IE_, &ht_ielen, pcur_bss->IELength-12);

		if (p && ht_ielen > 0) {

			pht_capie = (struct ieee80211_ht_cap *)(p+2);

drivers/staging/r8188eu/core/rtw_mlme.c

+0 −10
Original line number Diff line number Diff line
@@ -1916,16 +1916,6 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter) 
	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;

drivers/staging/r8188eu/core/rtw_p2p.c

+1 −1
Original line number Diff line number Diff line
@@ -1950,7 +1950,7 @@ int rtw_p2p_enable(struct adapter *padapter, enum P2P_ROLE role) 
		/*	Added by Albert 2011/03/22 */

		/*	In the P2P mode, the driver should not support the b mode. */

		/*	So, the Tx packet shouldn't use the CCK rate */

		update_tx_basic_rate(padapter, WIRELESS_11AGN);

		update_tx_basic_rate(padapter, (WIRELESS_11G | WIRELESS_11_24N));



		/* Enable P2P function */

		init_wifidirect_info(padapter, role);