staging: r8188eu: simplify error handling for missing station
authorMartin Kaiser <martin@kaiser.cx>
Sat, 26 Nov 2022 16:01:28 +0000 (17:01 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 5 Dec 2022 12:28:59 +0000 (13:28 +0100)
Simplify the code to handle the case where we're associated to a station
that is not in our list of known stations.

We can simply exit in this case. This patch reverts the if-condition and
saves one level of indentation.

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20221126160129.178697-10-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/core/rtw_mlme_ext.c

index 76424bcba416d4a5b80ed1786c240374da46d718..362313c49c526ffde216da8e6bbbcbb94542b660 100644 (file)
@@ -597,19 +597,19 @@ static void OnBeacon(struct adapter *padapter, struct recv_frame *precv_frame)
 
        if (((pmlmeinfo->state & 0x03) == WIFI_FW_STATION_STATE) && (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS)) {
                psta = rtw_get_stainfo(pstapriv, mgmt->sa);
-               if (psta) {
-                       ret = rtw_check_bcn_info(padapter, pframe, len);
-                       if (!ret) {
-                               receive_disconnect(padapter,
-                                                  pmlmeinfo->network.MacAddress, 0);
-                               return;
-                       }
-                       /* update WMM, ERP in the beacon */
-                       /* todo: the timer is used instead of the number of the beacon received */
-                       if ((sta_rx_pkts(psta) & 0xf) == 0)
-                               update_beacon_info(padapter, ie_ptr, ie_len, psta);
-                       process_p2p_ps_ie(padapter, ie_ptr, ie_len);
+               if (!psta)
+                       return;
+
+               ret = rtw_check_bcn_info(padapter, pframe, len);
+               if (!ret) {
+                       receive_disconnect(padapter, pmlmeinfo->network.MacAddress, 0);
+                       return;
                }
+               /* update WMM, ERP in the beacon */
+               /* todo: the timer is used instead of the number of the beacon received */
+               if ((sta_rx_pkts(psta) & 0xf) == 0)
+                       update_beacon_info(padapter, ie_ptr, ie_len, psta);
+               process_p2p_ps_ie(padapter, ie_ptr, ie_len);
        } else if ((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE) {
                psta = rtw_get_stainfo(pstapriv, mgmt->sa);
                if (psta) {