]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
staging: r8188eu: make OnAction_back static void
authorMartin Kaiser <martin@kaiser.cx>
Sun, 30 Oct 2022 17:33:17 +0000 (18:33 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 31 Oct 2022 08:09:03 +0000 (09:09 +0100)
OnAction_back is called only by OnAction, its return value is not checked.
We can make it a static void function.

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/20221030173326.1588647-5-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/core/rtw_mlme_ext.c
drivers/staging/r8188eu/include/rtw_mlme_ext.h

index 88600f62ffb4bd73bb4cbce87f6bbc1c5208690a..779c022b1c5064921ba5923ebdbda4ca50bb639a 100644 (file)
@@ -1481,7 +1481,7 @@ static void OnDisassoc(struct adapter *padapter, struct recv_frame *precv_frame)
        pmlmepriv->LinkDetectInfo.bBusyTraffic = false;
 }
 
-unsigned int OnAction_back(struct adapter *padapter, struct recv_frame *precv_frame)
+static void OnAction_back(struct adapter *padapter, struct recv_frame *precv_frame)
 {
        struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)precv_frame->rx_data;
        struct sta_info *psta = NULL;
@@ -1494,21 +1494,20 @@ unsigned int OnAction_back(struct adapter *padapter, struct recv_frame *precv_fr
        struct sta_priv *pstapriv = &padapter->stapriv;
        /* check RA matches or not */
        if (memcmp(myid(&padapter->eeprompriv), mgmt->da, ETH_ALEN))/* for if1, sta/ap mode */
-               return _SUCCESS;
+               return;
 
        if ((pmlmeinfo->state & 0x03) != WIFI_FW_AP_STATE)
                if (!(pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS))
-                       return _SUCCESS;
+                       return;
 
        psta = rtw_get_stainfo(pstapriv, mgmt->sa);
-
        if (!psta)
-               return _SUCCESS;
+               return;
 
        frame_body = (unsigned char *)(pframe + sizeof(struct ieee80211_hdr_3addr));
 
        if (!pmlmeinfo->HT_enable)
-               return _SUCCESS;
+               return;
        /* All union members start with an action code, it's ok to use addba_req. */
        switch (mgmt->u.action.u.addba_req.action_code) {
        case WLAN_ACTION_ADDBA_REQ:
@@ -1550,8 +1549,6 @@ unsigned int OnAction_back(struct adapter *padapter, struct recv_frame *precv_fr
        default:
                break;
        }
-
-       return _SUCCESS;
 }
 
 static int get_reg_classes_full_count(struct p2p_channels *channel_list)
index ec2e9352011beee8ce8f0aeb5f2a026cb19af3b4..4ccdce1ad9be3d6f772834115f571dbb0fe548a5 100644 (file)
@@ -536,8 +536,6 @@ void start_clnt_auth(struct adapter *padapter);
 void start_clnt_join(struct adapter *padapter);
 void start_create_ibss(struct adapter *padapter);
 
-unsigned int OnAction_back(struct adapter *padapter,
-                          struct recv_frame *precv_frame);
 unsigned int OnAction_p2p(struct adapter *padapter,
                          struct recv_frame *precv_frame);