Fix checkpatch warning: else is not generally useful after a break or return
Signed-off-by: Meir Elisha <meir6264@Gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_mlme.c | 38 +++++++++--------------
1 file changed, 14 insertions(+), 24 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 044483f3d678..efaac84f22b4 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -1540,30 +1540,23 @@ void _rtw_join_timeout_handler(struct timer_list *t)
spin_lock_bh(&pmlmepriv->lock);
- if (rtw_to_roam(adapter) > 0) { /* join timeout caused by roaming */
+ if (rtw_to_roam(adapter) == 0) { /* join timeout caused by roaming */
+ rtw_indicate_disconnect(adapter);
+ free_scanqueue(pmlmepriv);
+ /* indicate disconnect for the case that join_timeout and check_fwstate != FW_LINKED */
+ rtw_cfg80211_indicate_disconnect(adapter);
+ } else {
while (1) {
rtw_dec_to_roam(adapter);
- if (rtw_to_roam(adapter) != 0) { /* try another */
- int do_join_r;
-
- do_join_r = rtw_do_join(adapter);
- if (do_join_r != _SUCCESS)
- continue;
-
- break;
- } else {
+ if (rtw_to_roam(adapter) == 0) {
rtw_indicate_disconnect(adapter);
break;
+ } else if (rtw_do_join(adapter) != _SUCCESS) { /* try another */
+ continue;
}
- }
-
- } else {
- rtw_indicate_disconnect(adapter);
- free_scanqueue(pmlmepriv);/* */
-
- /* indicate disconnect for the case that join_timeout and check_fwstate != FW_LINKED */
- rtw_cfg80211_indicate_disconnect(adapter);
+ break;
+ }
}
spin_unlock_bh(&pmlmepriv->lock);
@@ -2102,12 +2095,9 @@ signed int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, u
}
iEntry = SecIsInPMKIDList(adapter, pmlmepriv->assoc_bssid);
- if (iEntry < 0) {
- return ielength;
- } else {
- if (authmode == WLAN_EID_RSN)
- ielength = rtw_append_pmkid(adapter, iEntry, out_ie, ielength);
- }
+ if (iEntry > 0 && authmode == WLAN_EID_RSN)
+ ielength = rtw_append_pmkid(adapter, iEntry, out_ie, ielength);
+
return ielength;
}
--
2.34.1