staging: rtl8723bs: remove redundant else branches

Adhere to Linux kernel coding style.

Reported by checkpatch:

WARNING: else is not generally useful after a break or return

Signed-off-by: Sevinj Aghayeva <sevinj.aghayeva@gmail.com>
Link: https://lore.kernel.org/r/fcb50e467d5ac81becf222379bcc21136966b86b.1649128267.git.sevinj.aghayeva@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index ee02db976cd5fa0a0c9d6dfabdee42eea3b87bce..c06be65b45cf57b28c9a0ab33408ee04d220ee24 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -908,10 +908,9 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_fram
                        set_link_timer(pmlmeext, REAUTH_TO);
 
                        return _SUCCESS;
-               } else {
-                       /*  open system */
-                       go2asoc = 1;
                }
+               /* open system */
+               go2asoc = 1;
        } else if (seq == 4) {
                if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared)
                        go2asoc = 1;
@@ -1468,6 +1467,7 @@ unsigned int OnDeAuth(struct adapter *padapter, union recv_frame *precv_frame)
        struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
        struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
        u8 *pframe = precv_frame->u.hdr.rx_data;
+       int ignore_received_deauth = 0;
 
        /* check A3 */
        if (memcmp(GetAddr3Ptr(pframe), get_my_bssid(&pmlmeinfo->network), ETH_ALEN))
@@ -1503,35 +1503,33 @@ unsigned int OnDeAuth(struct adapter *padapter, union recv_frame *precv_frame)
 
 
                return _SUCCESS;
-       } else {
-               int     ignore_received_deauth = 0;
-
-               /*      Commented by Albert 20130604 */
-               /*      Before sending the auth frame to start the STA/GC mode connection with AP/GO, */
-               /*      we will send the deauth first. */
-               /*      However, the Win8.1 with BRCM Wi-Fi will send the deauth with reason code 6 to us after receieving our deauth. */
-               /*      Added the following code to avoid this case. */
-               if ((pmlmeinfo->state & WIFI_FW_AUTH_STATE) ||
-                       (pmlmeinfo->state & WIFI_FW_ASSOC_STATE)) {
-                       if (reason == WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA) {
-                               ignore_received_deauth = 1;
-                       } else if (reason == WLAN_REASON_PREV_AUTH_NOT_VALID) {
-                               /*  TODO: 802.11r */
-                               ignore_received_deauth = 1;
-                       }
+       }
+
+       /*      Commented by Albert 20130604 */
+       /*      Before sending the auth frame to start the STA/GC mode connection with AP/GO, */
+       /*      we will send the deauth first. */
+       /*      However, the Win8.1 with BRCM Wi-Fi will send the deauth with reason code 6 to us after receieving our deauth. */
+       /*      Added the following code to avoid this case. */
+       if ((pmlmeinfo->state & WIFI_FW_AUTH_STATE) ||
+           (pmlmeinfo->state & WIFI_FW_ASSOC_STATE)) {
+               if (reason == WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA) {
+                       ignore_received_deauth = 1;
+               } else if (reason == WLAN_REASON_PREV_AUTH_NOT_VALID) {
+                       /*  TODO: 802.11r */
+                       ignore_received_deauth = 1;
                }
+       }
 
-               netdev_dbg(padapter->pnetdev,
-                          "sta recv deauth reason code(%d) sta:%pM, ignore = %d\n",
-                          reason, GetAddr3Ptr(pframe),
-                          ignore_received_deauth);
+       netdev_dbg(padapter->pnetdev,
+                  "sta recv deauth reason code(%d) sta:%pM, ignore = %d\n",
+                  reason, GetAddr3Ptr(pframe),
+                  ignore_received_deauth);
+
+       if (ignore_received_deauth == 0)
+               receive_disconnect(padapter, GetAddr3Ptr(pframe), reason);
 
-               if (ignore_received_deauth == 0)
-                       receive_disconnect(padapter, GetAddr3Ptr(pframe), reason);
-       }
        pmlmepriv->LinkDetectInfo.bBusyTraffic = false;
        return _SUCCESS;
-
 }
 
 unsigned int OnDisassoc(struct adapter *padapter, union recv_frame *precv_frame)
@@ -1575,13 +1573,13 @@ unsigned int OnDisassoc(struct adapter *padapter, union recv_frame *precv_frame)
                }
 
                return _SUCCESS;
-       } else {
-               netdev_dbg(padapter->pnetdev,
-                          "sta recv disassoc reason code(%d) sta:%pM\n",
-                          reason, GetAddr3Ptr(pframe));
-
-               receive_disconnect(padapter, GetAddr3Ptr(pframe), reason);
        }
+       netdev_dbg(padapter->pnetdev,
+                  "sta recv disassoc reason code(%d) sta:%pM\n",
+                  reason, GetAddr3Ptr(pframe));
+
+       receive_disconnect(padapter, GetAddr3Ptr(pframe), reason);
+
        pmlmepriv->LinkDetectInfo.bBusyTraffic = false;
        return _SUCCESS;