Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: wfx: make conditions easier to read

We prefer series of simple boolean conditions than computing bitmasks.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20191217161318.31402-21-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Jérôme Pouiller and committed by
Greg Kroah-Hartman
eddd8585 faffec88

+15 -12
+15 -12
drivers/staging/wfx/sta.c
··· 1055 1055 } 1056 1056 } 1057 1057 1058 - if (changed & 1059 - (BSS_CHANGED_BEACON | BSS_CHANGED_AP_PROBE_RESP | 1060 - BSS_CHANGED_BSSID | BSS_CHANGED_SSID | BSS_CHANGED_IBSS)) { 1058 + if (changed & BSS_CHANGED_BEACON || 1059 + changed & BSS_CHANGED_AP_PROBE_RESP || 1060 + changed & BSS_CHANGED_BSSID || 1061 + changed & BSS_CHANGED_SSID || 1062 + changed & BSS_CHANGED_IBSS) { 1061 1063 wvif->beacon_int = info->beacon_int; 1062 1064 wfx_update_beaconing(wvif); 1063 1065 wfx_upload_beacon(wvif); ··· 1097 1095 if (changed & BSS_CHANGED_BSSID) 1098 1096 do_join = true; 1099 1097 1100 - if (changed & 1101 - (BSS_CHANGED_ASSOC | BSS_CHANGED_BSSID | 1102 - BSS_CHANGED_IBSS | BSS_CHANGED_BASIC_RATES | 1103 - BSS_CHANGED_HT)) { 1098 + if (changed & BSS_CHANGED_ASSOC || 1099 + changed & BSS_CHANGED_BSSID || 1100 + changed & BSS_CHANGED_IBSS || 1101 + changed & BSS_CHANGED_BASIC_RATES || 1102 + changed & BSS_CHANGED_HT) { 1104 1103 if (info->assoc) { 1105 1104 if (wvif->state < WFX_STATE_PRE_STA) { 1106 1105 ieee80211_connection_loss(vif); ··· 1123 1120 } 1124 1121 1125 1122 /* ERP Protection */ 1126 - if (changed & (BSS_CHANGED_ASSOC | 1127 - BSS_CHANGED_ERP_CTS_PROT | 1128 - BSS_CHANGED_ERP_PREAMBLE)) { 1123 + if (changed & BSS_CHANGED_ASSOC || 1124 + changed & BSS_CHANGED_ERP_CTS_PROT || 1125 + changed & BSS_CHANGED_ERP_PREAMBLE) { 1129 1126 u32 prev_erp_info = wvif->erp_info; 1130 1127 1131 1128 if (info->use_cts_prot) ··· 1142 1139 schedule_work(&wvif->set_cts_work); 1143 1140 } 1144 1141 1145 - if (changed & (BSS_CHANGED_ASSOC | BSS_CHANGED_ERP_SLOT)) 1142 + if (changed & BSS_CHANGED_ASSOC || changed & BSS_CHANGED_ERP_SLOT) 1146 1143 hif_slot_time(wvif, info->use_short_slot ? 9 : 20); 1147 1144 1148 - if (changed & (BSS_CHANGED_ASSOC | BSS_CHANGED_CQM)) { 1145 + if (changed & BSS_CHANGED_ASSOC || changed & BSS_CHANGED_CQM) { 1149 1146 struct hif_mib_rcpi_rssi_threshold th = { 1150 1147 .rolling_average_count = 8, 1151 1148 .detection = 1,