Commit 79380bbf authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: remove code valid only for 5 GHz 



Remove code valid only for 5 GHz, according to the TODO.

- find and remove remaining code valid only for 5 GHz. Most of the obvious
  ones have been removed, but things like channel > 14 still exist.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20191024155918.13399-1-straube.linux@gmail.com


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

drivers/staging/rtl8188eu/core/rtw_ap.c

+3 −9
Original line number Diff line number Diff line
@@ -440,15 +440,9 @@ static void update_bmc_sta(struct adapter *padapter) 
				tx_ra_bitmap |= rtw_get_bit_value_from_ieee_value(psta->bssrateset[i] & 0x7f);

		}



		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 */

		} else {

		/* force to b mode */

		network_type = WIRELESS_11B;

		tx_ra_bitmap = 0xf;

		}



		raid = networktype_to_raid(network_type);

		init_rate = get_highest_rate_idx(tx_ra_bitmap & 0x0fffffff) & 0x3f;

drivers/staging/rtl8188eu/os_dep/ioctl_linux.c

+8 −22
Original line number Diff line number Diff line
@@ -147,19 +147,12 @@ static char *translate_scan(struct adapter *padapter, 
			snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");

		else

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

	} else {

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

			if (ht_cap)

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

			else

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

	} else {

		if (ht_cap)

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

		else

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

	}

	}



	start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_CHAR_LEN);
@@ -649,19 +642,12 @@ static int rtw_wx_get_name(struct net_device *dev, 
				snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11bgn");

			else

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

		} else {

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

				if (ht_cap)

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

				else

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

		} else {

			if (ht_cap)

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

			else

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

		}

		}

	} else {

		snprintf(wrqu->name, IFNAMSIZ, "unassociated");

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE