]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
staging: rtl8723bs: replace deeply nested if-else with switch-case
authorNikolay Kulikov <nikolayof23@gmail.com>
Mon, 23 Mar 2026 15:06:03 +0000 (18:06 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 31 Mar 2026 08:31:17 +0000 (10:31 +0200)
The main logic of the validate_recv_mgnt_frame() function is deeply
nested due to multiple if-else statements and additional block scope.
Fix this by replacing identical if-else with switch-case statements,
which will improve code readability and correct checkpatch.pl warnings
about line lengths.

Signed-off-by: Nikolay Kulikov <nikolayof23@gmail.com>
Link: https://patch.msgid.link/20260323150650.7168-2-nikolayof23@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723bs/core/rtw_recv.c

index a52884d2129ffd4dbe59ded8d6906c97bad12456..78746cc0d0785ad9960ea82a2d5344ad15b429f6 100644 (file)
@@ -1250,33 +1250,41 @@ static union recv_frame *recvframe_chk_defrag(struct adapter *padapter, union re
 static signed int validate_recv_mgnt_frame(struct adapter *padapter, union recv_frame *precv_frame)
 {
        /* struct mlme_priv *pmlmepriv = &adapter->mlmepriv; */
+       struct sta_info *psta;
 
        precv_frame = recvframe_chk_defrag(padapter, precv_frame);
        if (!precv_frame)
                return _SUCCESS;
 
-       {
-               /* for rx pkt statistics */
-               struct sta_info *psta = rtw_get_stainfo(&padapter->stapriv, GetAddr2Ptr(precv_frame->u.hdr.rx_data));
-
-               if (psta) {
-                       psta->sta_stats.rx_mgnt_pkts++;
-                       if (GetFrameSubType(precv_frame->u.hdr.rx_data) == WIFI_BEACON)
-                               psta->sta_stats.rx_beacon_pkts++;
-                       else if (GetFrameSubType(precv_frame->u.hdr.rx_data) == WIFI_PROBEREQ)
-                               psta->sta_stats.rx_probereq_pkts++;
-                       else if (GetFrameSubType(precv_frame->u.hdr.rx_data) == WIFI_PROBERSP) {
-                               if (!memcmp(padapter->eeprompriv.mac_addr, GetAddr1Ptr(precv_frame->u.hdr.rx_data), ETH_ALEN))
-                                       psta->sta_stats.rx_probersp_pkts++;
-                               else if (is_broadcast_mac_addr(GetAddr1Ptr(precv_frame->u.hdr.rx_data)) ||
-                                        is_multicast_mac_addr(GetAddr1Ptr(precv_frame->u.hdr.rx_data)))
-                                       psta->sta_stats.rx_probersp_bm_pkts++;
-                               else
-                                       psta->sta_stats.rx_probersp_uo_pkts++;
-                       }
-               }
+       /* for rx pkt statistics */
+       psta = rtw_get_stainfo(&padapter->stapriv, GetAddr2Ptr(precv_frame->u.hdr.rx_data));
+       if (!psta)
+               goto exit;
+
+       psta->sta_stats.rx_mgnt_pkts++;
+
+       switch (GetFrameSubType(precv_frame->u.hdr.rx_data)) {
+       case WIFI_BEACON:
+               psta->sta_stats.rx_beacon_pkts++;
+               break;
+       case WIFI_PROBEREQ:
+               psta->sta_stats.rx_probereq_pkts++;
+               break;
+       case WIFI_PROBERSP:
+               if (!memcmp(padapter->eeprompriv.mac_addr,
+                           GetAddr1Ptr(precv_frame->u.hdr.rx_data),
+                           ETH_ALEN))
+                       psta->sta_stats.rx_probersp_pkts++;
+               else if (is_broadcast_mac_addr(GetAddr1Ptr(precv_frame->u.hdr.rx_data)) ||
+                        is_multicast_mac_addr(GetAddr1Ptr(precv_frame->u.hdr.rx_data)))
+                       psta->sta_stats.rx_probersp_bm_pkts++;
+               else
+                       psta->sta_stats.rx_probersp_uo_pkts++;
+
+               break;
        }
 
+exit:
        mgt_dispatcher(padapter, precv_frame);
 
        return _SUCCESS;