staging: r8188eu: merge on_action_public_default into its only caller
authorMartin Kaiser <martin@kaiser.cx>
Fri, 30 Dec 2022 17:53:24 +0000 (18:53 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Jan 2023 18:31:11 +0000 (19:31 +0100)
Merge on_action_public_default into on_action_public, which is the only
caller. Yet again, this makes the code a tiny bit smaller.

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

index cfa65813d3f2cd1b2b85fccbf0d39729ba1986af..0b2f5d6c127929b5c808705b793561be48d8b133 100644 (file)
@@ -3735,29 +3735,20 @@ static unsigned int on_action_public_p2p(struct recv_frame *precv_frame)
        return _SUCCESS;
 }
 
-static void on_action_public_default(struct recv_frame *precv_frame)
-{
-       u8 *pframe = precv_frame->rx_data;
-       u8 *frame_body = pframe + sizeof(struct ieee80211_hdr_3addr);
-       u8 token;
-
-       token = frame_body[2];
-
-       rtw_action_public_decache(precv_frame, token);
-}
-
 static void on_action_public(struct adapter *padapter, struct recv_frame *precv_frame)
 {
        struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)precv_frame->rx_data;
        u8 *pframe = precv_frame->rx_data;
        u8 *frame_body = pframe + sizeof(struct ieee80211_hdr_3addr);
+       u8 token;
 
        /* All members of the action enum start with action_code. */
        if (mgmt->u.action.u.s1g.action_code == WLAN_PUB_ACTION_VENDOR_SPECIFIC) {
                if (!memcmp(frame_body + 2, P2P_OUI, 4))
                        on_action_public_p2p(precv_frame);
        } else {
-               on_action_public_default(precv_frame);
+               token = frame_body[2];
+               rtw_action_public_decache(precv_frame, token);
        }
 }