staging: rtl8723bs: use guard clause for stainfo check

Continue the refactor of rtw_aes_decrypt() by introducing a guard
clause for the stainfo check. This allows the subsequent multicast
and unicast decryption logic to be moved one indentation level to
the left, further improving code readability.

Signed-off-by: Lin YuChen <starpt.official@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org>
Link: https://patch.msgid.link/20260319120737.29692-3-starpt.official@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c b/drivers/staging/rtl8723bs/core/rtw_security.c
index 54640fa409b3de6b4df939ad2fdddcbf163e53f5..64c05437ff0190193f225aee92e160dc90309d85 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_security.c
+++ b/drivers/staging/rtl8723bs/core/rtw_security.c
@@ -1212,66 +1212,64 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
        if (prxattrib->encrypt != _AES_)
                return _SUCCESS;
        stainfo = rtw_get_stainfo(&padapter->stapriv, &prxattrib->ta[0]);
-       if (stainfo) {
-               if (is_multicast_ether_addr(prxattrib->ra)) {
-                       static unsigned long start;
-                       static u32 no_gkey_bc_cnt;
-                       static u32 no_gkey_mc_cnt;
-
-                       if (!psecuritypriv->binstallGrpkey) {
-                               res = _FAIL;
+       if (stainfo)
+               return _FAIL;
+       if (is_multicast_ether_addr(prxattrib->ra)) {
+               static unsigned long start;
+               static u32 no_gkey_bc_cnt;
+               static u32 no_gkey_mc_cnt;
 
-                               if (start == 0)
-                                       start = jiffies;
+               if (!psecuritypriv->binstallGrpkey) {
+                       res = _FAIL;
 
-                               if (is_broadcast_mac_addr(prxattrib->ra))
-                                       no_gkey_bc_cnt++;
-                               else
-                                       no_gkey_mc_cnt++;
-
-                               if (jiffies_to_msecs(jiffies - start) > 1000) {
-                                       if (no_gkey_bc_cnt || no_gkey_mc_cnt) {
-                                               netdev_dbg(padapter->pnetdev,
-                                                          FUNC_ADPT_FMT " no_gkey_bc_cnt:%u, no_gkey_mc_cnt:%u\n",
-                                                          FUNC_ADPT_ARG(padapter),
-                                                          no_gkey_bc_cnt,
-                                                          no_gkey_mc_cnt);
-                                       }
-                                       start = jiffies;
-                                       no_gkey_bc_cnt = 0;
-                                       no_gkey_mc_cnt = 0;
-                               }
+                       if (start == 0)
+                               start = jiffies;
 
-                               goto exit;
-                       }
+                       if (is_broadcast_mac_addr(prxattrib->ra))
+                               no_gkey_bc_cnt++;
+                       else
+                               no_gkey_mc_cnt++;
 
-                       if (no_gkey_bc_cnt || no_gkey_mc_cnt) {
-                               netdev_dbg(padapter->pnetdev,
-                                          FUNC_ADPT_FMT " gkey installed. no_gkey_bc_cnt:%u, no_gkey_mc_cnt:%u\n",
-                                          FUNC_ADPT_ARG(padapter),
-                                          no_gkey_bc_cnt,
-                                          no_gkey_mc_cnt);
+                       if (jiffies_to_msecs(jiffies - start) > 1000) {
+                               if (no_gkey_bc_cnt || no_gkey_mc_cnt) {
+                                       netdev_dbg(padapter->pnetdev,
+                                                  FUNC_ADPT_FMT " no_gkey_bc_cnt:%u, no_gkey_mc_cnt:%u\n",
+                                                  FUNC_ADPT_ARG(padapter),
+                                                  no_gkey_bc_cnt,
+                                                  no_gkey_mc_cnt);
+                               }
+                               start = jiffies;
+                               no_gkey_bc_cnt = 0;
+                               no_gkey_mc_cnt = 0;
                        }
-                       start = 0;
-                       no_gkey_bc_cnt = 0;
-                       no_gkey_mc_cnt = 0;
 
-                       prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey;
-                       if (psecuritypriv->dot118021XGrpKeyid != prxattrib->key_index) {
-                               res = _FAIL;
-                               goto exit;
-                       }
-               } else {
-                       prwskey = &stainfo->dot118021x_UncstKey.skey[0];
+                       goto exit;
                }
 
-               length = ((union recv_frame *)precvframe)->u.hdr.len - prxattrib->hdrlen - prxattrib->iv_len;
-
-               res = aes_decipher(prwskey, prxattrib->hdrlen, pframe, length);
+               if (no_gkey_bc_cnt || no_gkey_mc_cnt) {
+                       netdev_dbg(padapter->pnetdev,
+                                  FUNC_ADPT_FMT " gkey installed. no_gkey_bc_cnt:%u, no_gkey_mc_cnt:%u\n",
+                                  FUNC_ADPT_ARG(padapter),
+                                  no_gkey_bc_cnt,
+                                  no_gkey_mc_cnt);
+               }
+               start = 0;
+               no_gkey_bc_cnt = 0;
+               no_gkey_mc_cnt = 0;
 
+               prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey;
+               if (psecuritypriv->dot118021XGrpKeyid != prxattrib->key_index) {
+                       res = _FAIL;
+                       goto exit;
+               }
        } else {
-               res = _FAIL;
+               prwskey = &stainfo->dot118021x_UncstKey.skey[0];
        }
+
+       length = ((union recv_frame *)precvframe)->u.hdr.len - prxattrib->hdrlen - prxattrib->iv_len;
+
+       res = aes_decipher(prwskey, prxattrib->hdrlen, pframe, length);
+
 exit:
        return res;
 }