Commit 0c9adc24 authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

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: default avatarMartin 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 51413ad5

drivers/staging/r8188eu/core/rtw_mlme_ext.c

+3 −12
Original line number Diff line number Diff line
@@ -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);

	}

}