leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: rtl8723bs: fix comparsions to true

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

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Michael Straube 2018-07-12 12:36:10 +02:00 committed by Greg Kroah-Hartman
parent 6bf4d28ea1
commit 153c6b11eb
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/rtl8723bs/core/rtw_ieee80211.c
View File

@ -95,14 +95,14 @@ bool rtw_is_cckratesonly_included(u8 *rate)
int rtw_check_network_type(unsigned char *rate, int ratelen, int channel) int rtw_check_network_type(unsigned char *rate, int ratelen, int channel)
{ {
if (channel > 14) { if (channel > 14) {
if ((rtw_is_cckrates_included(rate)) == true) if (rtw_is_cckrates_included(rate))
return WIRELESS_INVALID; return WIRELESS_INVALID;
else else
return WIRELESS_11A; return WIRELESS_11A;
} else{ /* could be pure B, pure G, or B/G */ } 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; return WIRELESS_11B;
else if ((rtw_is_cckrates_included(rate)) == true) else if (rtw_is_cckrates_included(rate))
return WIRELESS_11BG; return WIRELESS_11BG;
else else
return WIRELESS_11G; return WIRELESS_11G;

28
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
View File

@ -126,26 +126,26 @@ static char *translate_scan(struct adapter *padapter,
/* Add the protocol name */ /* Add the protocol name */
iwe.cmd = SIOCGIWNAME; iwe.cmd = SIOCGIWNAME;
if ((rtw_is_cckratesonly_included((u8 *)&pnetwork->network.SupportedRates)) == true) { if (rtw_is_cckratesonly_included((u8 *)&pnetwork->network.SupportedRates)) {
if (ht_cap == true) if (ht_cap)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn"); snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else else
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11b"); snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11b");
} else if ((rtw_is_cckrates_included((u8 *)&pnetwork->network.SupportedRates)) == true) { } else if (rtw_is_cckrates_included((u8 *)&pnetwork->network.SupportedRates)) {
if (ht_cap == true) if (ht_cap)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn"); snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
else else
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bg"); snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bg");
} else { } else {
if (pnetwork->network.Configuration.DSConfig > 14) { if (pnetwork->network.Configuration.DSConfig > 14) {
if (vht_cap == true) if (vht_cap)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11AC"); 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"); snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11an");
else else
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11a"); snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11a");
} else { } else {
if (ht_cap == true) if (ht_cap)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11gn"); snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11gn");
else else
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11g"); 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; prates = &pcur_bss->SupportedRates;
if (rtw_is_cckratesonly_included((u8 *)prates) == true) { if (rtw_is_cckratesonly_included((u8 *)prates)) {
if (ht_cap == true) if (ht_cap)
snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11bn"); snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11bn");
else else
snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11b"); snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11b");
} else if ((rtw_is_cckrates_included((u8 *)prates)) == true) { } else if (rtw_is_cckrates_included((u8 *)prates)) {
if (ht_cap == true) if (ht_cap)
snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11bgn"); snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11bgn");
else else
snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11bg"); snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11bg");
} else { } else {
if (pcur_bss->Configuration.DSConfig > 14) { if (pcur_bss->Configuration.DSConfig > 14) {
if (vht_cap == true) if (vht_cap)
snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11AC"); snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11AC");
else if (ht_cap == true) else if (ht_cap)
snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11an"); snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11an");
else else
snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11a"); snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11a");
} else { } else {
if (ht_cap == true) if (ht_cap)
snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11gn"); snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11gn");
else else
snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11g"); snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11g");