Skip to content

Commit c4587d0

Browse files
nikolayof12gregkh
authored andcommitted
staging: rtl8723bs: replace deeply nested if-else with switch-case
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>
1 parent 8c964b8 commit c4587d0

1 file changed

Lines changed: 28 additions & 20 deletions

File tree

drivers/staging/rtl8723bs/core/rtw_recv.c

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1250,33 +1250,41 @@ static union recv_frame *recvframe_chk_defrag(struct adapter *padapter, union re
12501250
static signed int validate_recv_mgnt_frame(struct adapter *padapter, union recv_frame *precv_frame)
12511251
{
12521252
/* struct mlme_priv *pmlmepriv = &adapter->mlmepriv; */
1253+
struct sta_info *psta;
12531254

12541255
precv_frame = recvframe_chk_defrag(padapter, precv_frame);
12551256
if (!precv_frame)
12561257
return _SUCCESS;
12571258

1258-
{
1259-
/* for rx pkt statistics */
1260-
struct sta_info *psta = rtw_get_stainfo(&padapter->stapriv, GetAddr2Ptr(precv_frame->u.hdr.rx_data));
1261-
1262-
if (psta) {
1263-
psta->sta_stats.rx_mgnt_pkts++;
1264-
if (GetFrameSubType(precv_frame->u.hdr.rx_data) == WIFI_BEACON)
1265-
psta->sta_stats.rx_beacon_pkts++;
1266-
else if (GetFrameSubType(precv_frame->u.hdr.rx_data) == WIFI_PROBEREQ)
1267-
psta->sta_stats.rx_probereq_pkts++;
1268-
else if (GetFrameSubType(precv_frame->u.hdr.rx_data) == WIFI_PROBERSP) {
1269-
if (!memcmp(padapter->eeprompriv.mac_addr, GetAddr1Ptr(precv_frame->u.hdr.rx_data), ETH_ALEN))
1270-
psta->sta_stats.rx_probersp_pkts++;
1271-
else if (is_broadcast_mac_addr(GetAddr1Ptr(precv_frame->u.hdr.rx_data)) ||
1272-
is_multicast_mac_addr(GetAddr1Ptr(precv_frame->u.hdr.rx_data)))
1273-
psta->sta_stats.rx_probersp_bm_pkts++;
1274-
else
1275-
psta->sta_stats.rx_probersp_uo_pkts++;
1276-
}
1277-
}
1259+
/* for rx pkt statistics */
1260+
psta = rtw_get_stainfo(&padapter->stapriv, GetAddr2Ptr(precv_frame->u.hdr.rx_data));
1261+
if (!psta)
1262+
goto exit;
1263+
1264+
psta->sta_stats.rx_mgnt_pkts++;
1265+
1266+
switch (GetFrameSubType(precv_frame->u.hdr.rx_data)) {
1267+
case WIFI_BEACON:
1268+
psta->sta_stats.rx_beacon_pkts++;
1269+
break;
1270+
case WIFI_PROBEREQ:
1271+
psta->sta_stats.rx_probereq_pkts++;
1272+
break;
1273+
case WIFI_PROBERSP:
1274+
if (!memcmp(padapter->eeprompriv.mac_addr,
1275+
GetAddr1Ptr(precv_frame->u.hdr.rx_data),
1276+
ETH_ALEN))
1277+
psta->sta_stats.rx_probersp_pkts++;
1278+
else if (is_broadcast_mac_addr(GetAddr1Ptr(precv_frame->u.hdr.rx_data)) ||
1279+
is_multicast_mac_addr(GetAddr1Ptr(precv_frame->u.hdr.rx_data)))
1280+
psta->sta_stats.rx_probersp_bm_pkts++;
1281+
else
1282+
psta->sta_stats.rx_probersp_uo_pkts++;
1283+
1284+
break;
12781285
}
12791286

1287+
exit:
12801288
mgt_dispatcher(padapter, precv_frame);
12811289

12821290
return _SUCCESS;

0 commit comments

Comments
 (0)