lkml.org 
[lkml]   [2022]   [Oct]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 09/13] staging: r8188eu: clean up on_action_public
    Date
    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.

    Signed-off-by: Martin Kaiser <martin@kaiser.cx>
    ---
    Changes in v2
    - don't remove the ret variable, it's already gone

    drivers/staging/r8188eu/core/rtw_mlme_ext.c | 13 +++----------
    1 file 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 @@ static unsigned int on_action_public_default(struct recv_frame *precv_frame)
    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)
    --
    2.30.2
    \
     
     \ /
      Last update: 2022-10-30 18:35    [W:4.497 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site