Commit 7af5bd0c authored by Robert Węcławski's avatar Robert Węcławski Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: remove code that is valid only for 5 GHz 



Remove code that is used only for 5 GHz.
This addresses the below TODO item:

- 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 avatarRobert Węcławski <r.weclawski@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4f6f4408

drivers/staging/rtl8188eu/core/rtw_ap.c

+7 −16
Original line number Diff line number Diff line
@@ -337,8 +337,6 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level) 
	unsigned char sta_band = 0, raid, shortGIrate = false;

	unsigned int tx_ra_bitmap = 0;

	struct ht_priv	*psta_ht = NULL;

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct wlan_bssid_ex *pcur_network = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network;



	if (psta)

		psta_ht = &psta->htpriv;
@@ -363,20 +361,13 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level) 
		shortGIrate = psta_ht->sgi;

	}



	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;

	} else {

	if (tx_ra_bitmap & 0xffff000)

		sta_band |= WIRELESS_11_24N | WIRELESS_11G | WIRELESS_11B;

	else if (tx_ra_bitmap & 0xff0)

		sta_band |= WIRELESS_11G | WIRELESS_11B;

	else

		sta_band |= WIRELESS_11B;

	}





	psta->wireless_mode = sta_band;

drivers/staging/rtl8188eu/core/rtw_debug.c

+1 −24
Original line number Diff line number Diff line
@@ -153,13 +153,11 @@ int proc_get_best_channel(char *page, char **start, 
	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);

	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;

	int len = 0;

	u32 i, best_channel_24G = 1, best_channel_5G = 36, index_24G = 0, index_5G = 0;

	u32 i, best_channel_24G = 1, index_24G = 0;



	for (i = 0; pmlmeext->channel_set[i].ChannelNum != 0; i++) {

		if (pmlmeext->channel_set[i].ChannelNum == 1)

			index_24G = i;

		if (pmlmeext->channel_set[i].ChannelNum == 36)

			index_5G = i;

	}



	for (i = 0; pmlmeext->channel_set[i].ChannelNum != 0; i++) {
@@ -171,32 +169,11 @@ int proc_get_best_channel(char *page, char **start, 
			}

		}



		/*  5G */

		if (pmlmeext->channel_set[i].ChannelNum >= 36 &&

		    pmlmeext->channel_set[i].ChannelNum < 140) {

			/*  Find primary channel */

			if (((pmlmeext->channel_set[i].ChannelNum - 36) % 8 == 0) &&

			    (pmlmeext->channel_set[i].rx_count < pmlmeext->channel_set[index_5G].rx_count)) {

				index_5G = i;

				best_channel_5G = pmlmeext->channel_set[i].ChannelNum;

			}

		}



		if (pmlmeext->channel_set[i].ChannelNum >= 149 &&

		    pmlmeext->channel_set[i].ChannelNum < 165) {

			/*  find primary channel */

			if (((pmlmeext->channel_set[i].ChannelNum - 149) % 8 == 0) &&

			    (pmlmeext->channel_set[i].rx_count < pmlmeext->channel_set[index_5G].rx_count)) {

				index_5G = i;

				best_channel_5G = pmlmeext->channel_set[i].ChannelNum;

			}

		}

		/*  debug */

		len += snprintf(page + len, count - len, "The rx cnt of channel %3d = %d\n",

					pmlmeext->channel_set[i].ChannelNum, pmlmeext->channel_set[i].rx_count);

	}



	len += snprintf(page + len, count - len, "best_channel_5G = %d\n", best_channel_5G);

	len += snprintf(page + len, count - len, "best_channel_24G = %d\n", best_channel_24G);



	*eof = 1;

drivers/staging/rtl8188eu/core/rtw_mlme.c

+1 −11
Original line number Diff line number Diff line
@@ -1819,18 +1819,8 @@ 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 */

		pdev_network->NetworkTypeInUse = Ndis802_11OFDM24;

		break;

	}

drivers/staging/rtl8188eu/core/rtw_mlme_ext.c

+1 −12
Original line number Diff line number Diff line
@@ -2401,10 +2401,7 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid 
			p++;



			for (j = 0; j < noc; j++) {

				if (fcn <= 14)

					channel = fcn + j; /*  2.4 GHz */

				else

					channel = fcn + j*4; /*  5 GHz */

				channel = fcn + j;



				chplan_ap.Channel[i++] = channel;

			}
@@ -2481,14 +2478,6 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid 
				j++;

		}



		/*  keep original STA 5G channel plan */

		while ((i < MAX_CHANNEL_NUM) && (chplan_sta[i].ChannelNum != 0)) {

			chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum;

			chplan_new[k].ScanType = chplan_sta[i].ScanType;

			i++;

			k++;

		}



		pmlmeext->update_channel_plan_by_ap_done = 1;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE