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

staging: r8188eu: Remove no more necessary definitions and code 



Remove no more necessary further 5GHz related code, along with no
more used definitions of macro and variables.

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-4-fmdefrancesco@gmail.com


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

drivers/staging/r8188eu/core/rtw_debug.c

+1 −24
Original line number Diff line number Diff line
@@ -876,13 +876,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++) {
@@ -894,32 +892,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/r8188eu/core/rtw_ioctl_set.c

+1 −1
Original line number Diff line number Diff line
@@ -870,7 +870,7 @@ int rtw_set_channel_plan(struct adapter *adapter, u8 channel_plan) 
*/

int rtw_set_country(struct adapter *adapter, const char *country_code)

{

	int channel_plan = RT_CHANNEL_DOMAIN_WORLD_WIDE_5G;

	int channel_plan = RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN_2G;



	DBG_88E("%s country_code:%s\n", __func__, country_code);

drivers/staging/r8188eu/core/rtw_mlme_ext.c

+3 −10
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ static struct rt_channel_plan_map RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX] = { 
	{0x01},	/* 0x10, RT_CHANNEL_DOMAIN_JAPAN */

	{0x02},	/* 0x11, RT_CHANNEL_DOMAIN_FCC_NO_DFS */

	{0x01},	/* 0x12, RT_CHANNEL_DOMAIN_JAPAN_NO_DFS */

	{0x00},	/* 0x13, RT_CHANNEL_DOMAIN_WORLD_WIDE_5G */

	{0x02},	/* 0x14, RT_CHANNEL_DOMAIN_TAIWAN_NO_DFS */

	{0x00},	/* 0x15, RT_CHANNEL_DOMAIN_ETSI_NO_DFS */

	{0x00},	/* 0x16, RT_CHANNEL_DOMAIN_KOREA_NO_DFS */
@@ -116,7 +115,6 @@ static struct rt_channel_plan_map RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX] = { 
	{0x00},	/* 0x1C, */

	{0x00},	/* 0x1D, */

	{0x00},	/* 0x1E, */

	{0x05},	/* 0x1F, RT_CHANNEL_DOMAIN_WORLD_WIDE_ONLY_5G */

	/*  0x20 ~ 0x7F , New Define ===== */

	{0x00},	/* 0x20, RT_CHANNEL_DOMAIN_WORLD_NULL */

	{0x01},	/* 0x21, RT_CHANNEL_DOMAIN_ETSI1_NULL */
@@ -6813,11 +6811,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;

			}

		}
@@ -6834,11 +6828,10 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid 
		if (pregistrypriv->wireless_mode & WIRELESS_11G) {

			do {

				if ((i == MAX_CHANNEL_NUM) ||

				    (chplan_sta[i].ChannelNum == 0) ||

				    (chplan_sta[i].ChannelNum > 14))

				    (chplan_sta[i].ChannelNum == 0))

					break;



				if ((j == chplan_ap.Len) || (chplan_ap.Channel[j] > 14))

				if (j == chplan_ap.Len)

					break;



				if (chplan_sta[i].ChannelNum == chplan_ap.Channel[j]) {

drivers/staging/r8188eu/hal/odm.c

+3 −16
Original line number Diff line number Diff line
@@ -620,17 +620,11 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm) 
				FirstConnect = (pDM_Odm->bLinked) && (!pDM_DigTable->bMediaConnect_1);

				FirstDisConnect = (!pDM_Odm->bLinked) && (pDM_DigTable->bMediaConnect_1);

			}

		} else {

			if (*pDM_Odm->pBandType == ODM_BAND_5G) {

				DIG_Dynamic_MIN = pDM_DigTable->DIG_Dynamic_MIN_0;

				FirstConnect = (pDM_Odm->bLinked) && (!pDM_DigTable->bMediaConnect_0);

				FirstDisConnect = (!pDM_Odm->bLinked) && (pDM_DigTable->bMediaConnect_0);

		} else {

			DIG_Dynamic_MIN = pDM_DigTable->DIG_Dynamic_MIN_1;

			FirstConnect = (pDM_Odm->bLinked) && (!pDM_DigTable->bMediaConnect_1);

			FirstDisConnect = (!pDM_Odm->bLinked) && (pDM_DigTable->bMediaConnect_1);

		}

		}

	} else {

		DIG_Dynamic_MIN = pDM_DigTable->DIG_Dynamic_MIN_0;

		FirstConnect = (pDM_Odm->bLinked) && (!pDM_DigTable->bMediaConnect_0);
@@ -1094,12 +1088,6 @@ u32 ODM_Get_Rate_Bitmap(struct odm_dm_struct *pDM_Odm, u32 macid, u32 ra_mask, u 
		else

			rate_bitmap = 0x0000000f;

		break;

	case (ODM_WM_A|ODM_WM_G):

		if (rssi_level == DM_RATR_STA_HIGH)

			rate_bitmap = 0x00000f00;

		else

			rate_bitmap = 0x00000ff0;

		break;

	case (ODM_WM_B|ODM_WM_G):

		if (rssi_level == DM_RATR_STA_HIGH)

			rate_bitmap = 0x00000f00;
@@ -1109,7 +1097,6 @@ u32 ODM_Get_Rate_Bitmap(struct odm_dm_struct *pDM_Odm, u32 macid, u32 ra_mask, u 
			rate_bitmap = 0x00000ff5;

		break;

	case (ODM_WM_B|ODM_WM_G|ODM_WM_N24G):

	case (ODM_WM_A|ODM_WM_B|ODM_WM_G|ODM_WM_N24G):

		if (pDM_Odm->RFType == ODM_1T2R || pDM_Odm->RFType == ODM_1T1R) {

			if (rssi_level == DM_RATR_STA_HIGH) {

				rate_bitmap = 0x000f0000;

drivers/staging/r8188eu/hal/rtl8188e_phycfg.c

+0 −3
Original line number Diff line number Diff line
@@ -1026,9 +1026,6 @@ _PHY_SetBWMode92C( 
	case RF_8256:

		/*  Please implement this function in Hal8190PciPhy8256.c */

		break;

	case RF_8258:

		/*  Please implement this function in Hal8190PciPhy8258.c */

		break;

	case RF_PSEUDO_11N:

		break;

	case RF_6052: