]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
staging: r8188eu: replace GetAddr1Ptr call in OnAction_p2p
authorMartin Kaiser <martin@kaiser.cx>
Sun, 30 Oct 2022 17:33:21 +0000 (18:33 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 31 Oct 2022 08:09:04 +0000 (09:09 +0100)
Define a struct ieee80211_mgmt in OnAction_p2p and use it to check the
destination address. This replaces a call to the driver-specific
GetAddr1Ptr function.

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-9-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/core/rtw_mlme_ext.c

index 64d01da9c8140c2fe55846a9c9cba0507f5ab983..6d95d3bc23e6c7304abd82116d4ea3b8a0ef31aa 100644 (file)
@@ -3834,6 +3834,7 @@ static void on_action_public(struct adapter *padapter, struct recv_frame *precv_
 
 static void OnAction_p2p(struct adapter *padapter, struct recv_frame *precv_frame)
 {
+       struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)precv_frame->rx_data;
        u8 *frame_body;
        u8 OUI_Subtype;
        u8 *pframe = precv_frame->rx_data;
@@ -3841,7 +3842,7 @@ static void OnAction_p2p(struct adapter *padapter, struct recv_frame *precv_fram
        struct  wifidirect_info *pwdinfo = &padapter->wdinfo;
 
        /* check RA matches or not */
-       if (memcmp(myid(&padapter->eeprompriv), GetAddr1Ptr(pframe), ETH_ALEN))/* for if1, sta/ap mode */
+       if (memcmp(myid(&padapter->eeprompriv), mgmt->da, ETH_ALEN))/* for if1, sta/ap mode */
                return;
 
        frame_body = (unsigned char *)(pframe + sizeof(struct ieee80211_hdr_3addr));