diff options
| author | Martin Kaiser <martin@kaiser.cx> | 2022-10-30 18:33:22 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-10-31 09:09:04 +0100 |
| commit | a05159da5a4e49fd4b34cb00fb33badeb4dc9ec3 (patch) | |
| tree | c0dc48832038e1589e03521878380cb27e02d793 | |
| parent | staging: r8188eu: replace GetAddr1Ptr call in OnAction_p2p (diff) | |
| download | linux-a05159da5a4e49fd4b34cb00fb33badeb4dc9ec3.tar.gz linux-a05159da5a4e49fd4b34cb00fb33badeb4dc9ec3.zip | |
staging: r8188eu: clean up on_action_public
Use the struct mgmt to read the action_code. This is much simpler than
parsing the message ourselves.
Add a comment about reading the action code. All members of the action
enum start with an action_code byte. It does not matter which member we
use.
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-10-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/r8188eu/core/rtw_mlme_ext.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c index 6d95d3bc23e6..b3cef3504ad3 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -3813,23 +3813,16 @@ exit: 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 action; /* check RA matches or not */ if (memcmp(myid(&padapter->eeprompriv), mgmt->da, ETH_ALEN)) return; - action = frame_body[1]; - switch (action) { - case ACT_PUBLIC_VENDOR: + /* All members of the action enum start with action_code. */ + if (mgmt->u.action.u.s1g.action_code == WLAN_PUB_ACTION_VENDOR_SPECIFIC) on_action_public_vendor(precv_frame); - break; - default: + else on_action_public_default(precv_frame); - break; - } } static void OnAction_p2p(struct adapter *padapter, struct recv_frame *precv_frame) |