Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 153c6b11 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: fix comparsions to true 



Use if(x) instead of if(x == true).

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6bf4d28e

drivers/staging/rtl8723bs/core/rtw_ieee80211.c

+3 −3
Original line number Diff line number Diff line
@@ -95,14 +95,14 @@ bool rtw_is_cckratesonly_included(u8 *rate) 
int rtw_check_network_type(unsigned char *rate, int ratelen, int channel)

{

	if (channel > 14) {

		if ((rtw_is_cckrates_included(rate)) == true)

		if (rtw_is_cckrates_included(rate))

			return WIRELESS_INVALID;

		else

			return WIRELESS_11A;

	} else{ /*  could be pure B, pure G, or B/G */

		if ((rtw_is_cckratesonly_included(rate)) == true)

		if (rtw_is_cckratesonly_included(rate))

			return WIRELESS_11B;

		else if ((rtw_is_cckrates_included(rate)) == true)

		else if (rtw_is_cckrates_included(rate))

			return	WIRELESS_11BG;

		else

			return WIRELESS_11G;

drivers/staging/rtl8723bs/os_dep/ioctl_linux.c

+14 −14
Original line number Diff line number Diff line
@@ -126,26 +126,26 @@ static char *translate_scan(struct adapter *padapter, 


	/* Add the protocol name */

	iwe.cmd = SIOCGIWNAME;

	if ((rtw_is_cckratesonly_included((u8 *)&pnetwork->network.SupportedRates)) == true) {

		if (ht_cap == true)

	if (rtw_is_cckratesonly_included((u8 *)&pnetwork->network.SupportedRates)) {

		if (ht_cap)

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

		else

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

	} else if ((rtw_is_cckrates_included((u8 *)&pnetwork->network.SupportedRates)) == true) {

		if (ht_cap == true)

	} else if (rtw_is_cckrates_included((u8 *)&pnetwork->network.SupportedRates)) {

		if (ht_cap)

			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 (vht_cap == true)

			if (vht_cap)

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

			else if (ht_cap == true)

			else if (ht_cap)

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

			else

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

		} else {

			if (ht_cap == true)

			if (ht_cap)

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

			else

				snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11g");
@@ -785,26 +785,26 @@ static int rtw_wx_get_name(struct net_device *dev, 


		prates = &pcur_bss->SupportedRates;



		if (rtw_is_cckratesonly_included((u8 *)prates) == true) {

			if (ht_cap == true)

		if (rtw_is_cckratesonly_included((u8 *)prates)) {

			if (ht_cap)

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

			else

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

		} else if ((rtw_is_cckrates_included((u8 *)prates)) == true) {

			if (ht_cap == true)

		} else if (rtw_is_cckrates_included((u8 *)prates)) {

			if (ht_cap)

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

			else

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

		} else {

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

				if (vht_cap == true)

				if (vht_cap)

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

				else if (ht_cap == true)

				else if (ht_cap)

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

				else

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

			} else {

				if (ht_cap == true)

				if (ht_cap)

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

				else

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