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

staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_DISABLE_MCS13TO15 



remove conditional code blocks checked by unused
CONFIG_DISABLE_MCS13TO15

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

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


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

drivers/staging/rtl8723bs/core/rtw_mlme.c

+1 −15
Original line number Diff line number Diff line
@@ -2679,14 +2679,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ 
		if (stbc_rx_enable)

			ht_capie.cap_info |= cpu_to_le16(IEEE80211_HT_CAP_RX_STBC_2R);/* RX STBC two spatial stream */



		#ifdef CONFIG_DISABLE_MCS13TO15

		if (((cbw40_enable == 1) && (operation_bw == CHANNEL_WIDTH_40)) && (pregistrypriv->wifi_spec != 1))

				set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, MCS_RATE_2R_13TO15_OFF);

		else

				set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, MCS_RATE_2R);

		#else /* CONFIG_DISABLE_MCS13TO15 */

		set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, MCS_RATE_2R);

		#endif /* CONFIG_DISABLE_MCS13TO15 */

		break;

	}
@@ -2809,14 +2802,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe 
			break;

		case RF_2T2R:

		default:

#ifdef CONFIG_DISABLE_MCS13TO15

			if (pmlmeext->cur_bwmode == CHANNEL_WIDTH_40 && pregistrypriv->wifi_spec != 1)

				set_mcs_rate_by_mask(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_RATE_2R_13TO15_OFF);

			else

				set_mcs_rate_by_mask(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_RATE_2R);

#else /* CONFIG_DISABLE_MCS13TO15 */

			set_mcs_rate_by_mask(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_RATE_2R);

#endif /* CONFIG_DISABLE_MCS13TO15 */

		}



		/* switch to the 40M Hz mode according to the AP */

drivers/staging/rtl8723bs/core/rtw_wlan_util.c

+0 −7
Original line number Diff line number Diff line
@@ -1071,14 +1071,7 @@ void HT_caps_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE) 
		break;

	case RF_2T2R:

	default:

#ifdef CONFIG_DISABLE_MCS13TO15

		if (pmlmeext->cur_bwmode == CHANNEL_WIDTH_40 && pregistrypriv->wifi_spec != 1)

			set_mcs_rate_by_mask(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_RATE_2R_13TO15_OFF);

		else

			set_mcs_rate_by_mask(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_RATE_2R);

#else /* CONFIG_DISABLE_MCS13TO15 */

		set_mcs_rate_by_mask(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_RATE_2R);

#endif /* CONFIG_DISABLE_MCS13TO15 */

	}



	if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {