Commit ddd7c8b0 authored by Fabio Aiuto's avatar Fabio Aiuto Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove 5Ghz code blocks 



remove 5 Ghz code blocks, related to networks
working over channel numbers above 14.

Signed-off-by: default avatarFabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/c64443b92ce1a60f568db153842a62e3244a8c3a.1626874164.git.fabioaiuto83@gmail.com


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

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+2 −5
Original line number Diff line number Diff line
@@ -3708,7 +3708,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) 
			p = rtw_get_ie(pbss_network->IEs + _FIXED_IE_LENGTH_, WLAN_EID_HT_CAPABILITY, &len, pbss_network->IELength - _FIXED_IE_LENGTH_);

			if ((p == NULL) || (len == 0)) {/* non-HT */



				if ((pbss_network->Configuration.DSConfig <= 0) || (pbss_network->Configuration.DSConfig > 14))

				if (pbss_network->Configuration.DSConfig <= 0)

					continue;



				ICS[0][pbss_network->Configuration.DSConfig] = 1;
@@ -5428,10 +5428,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) 
			{

				struct HT_info_element *pht_info = (struct HT_info_element *)(pIE->data);



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

					if ((pregpriv->bw_mode >> 4) > CHANNEL_WIDTH_20)

						cbw40_enable = 1;

				} else {

				if (pnetwork->Configuration.DSConfig <= 14) {

					if ((pregpriv->bw_mode & 0x0f) > CHANNEL_WIDTH_20)

						cbw40_enable = 1;

				}

drivers/staging/rtl8723bs/os_dep/ioctl_linux.c

+3 −17
Original line number Diff line number Diff line
@@ -129,14 +129,7 @@ static char *translate_scan(struct adapter *padapter, 
		else

			snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bg");

	} else {

		if (pnetwork->network.Configuration.DSConfig > 14) {

			if (vht_cap)

				snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11AC");

			else if (ht_cap)

				snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11an");

			else

				snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11a");

		} else {

		if (pnetwork->network.Configuration.DSConfig <= 14) {

			if (ht_cap)

				snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11gn");

			else
@@ -683,7 +676,7 @@ static int rtw_wx_get_name(struct net_device *dev, 
	struct adapter *padapter = rtw_netdev_priv(dev);

	u32 ht_ielen = 0;

	char *p;

	u8 ht_cap = false, vht_cap = false;

	u8 ht_cap = false;

	struct	mlme_priv *pmlmepriv = &(padapter->mlmepriv);

	struct wlan_bssid_ex  *pcur_bss = &pmlmepriv->cur_network.network;

	NDIS_802_11_RATES_EX *prates = NULL;
@@ -707,14 +700,7 @@ static int rtw_wx_get_name(struct net_device *dev, 
			else

				snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11bg");

		} else {

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

				if (vht_cap)

					snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11AC");

				else if (ht_cap)

					snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11an");

				else

					snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11a");

			} else {

			if (pcur_bss->Configuration.DSConfig <= 14) {

				if (ht_cap)

					snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11gn");

				else