From: Martin Kaiser Date: Fri, 30 Dec 2022 17:53:24 +0000 (+0100) Subject: staging: r8188eu: merge on_action_public_default into its only caller X-Git-Tag: v6.6.7~3436^2~181 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c9adc24eaebf075ef8eb8ae2dcf9f7208930466;p=platform%2Fkernel%2Flinux-starfive.git staging: r8188eu: merge on_action_public_default into its only caller 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 Tested-by: Philipp Hortmann # Edimax N150 Link: https://lore.kernel.org/r/20221230175326.90617-3-martin@kaiser.cx Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c index cfa6581..0b2f5d6 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -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); } }