From: Martin Kaiser <martin@kaiser.cx>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Larry Finger <Larry.Finger@lwfinger.net>,
Phillip Potter <phil@philpotter.co.uk>,
Michael Straube <straube.linux@gmail.com>,
Pavel Skripkin <paskripkin@gmail.com>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Martin Kaiser <martin@kaiser.cx>
Subject: [PATCH 03/10] staging: r8188eu: replace GetAddr2Ptr calls
Date: Sat, 26 Nov 2022 17:01:22 +0100 [thread overview]
Message-ID: <20221126160129.178697-4-martin@kaiser.cx> (raw)
In-Reply-To: <20221126160129.178697-1-martin@kaiser.cx>
Get the source address of a beacon frame from our struct ieee80211_mgmt
instead of using the driver's internal GetAddr2Ptr helper.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 66e3a90da3a3..5a31b20dc46d 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -586,7 +586,7 @@ static void OnBeacon(struct adapter *padapter, struct recv_frame *precv_frame)
}
if (((pmlmeinfo->state & 0x03) == WIFI_FW_STATION_STATE) && (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS)) {
- psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe));
+ psta = rtw_get_stainfo(pstapriv, mgmt->sa);
if (psta) {
ret = rtw_check_bcn_info(padapter, pframe, len);
if (!ret) {
@@ -601,7 +601,7 @@ static void OnBeacon(struct adapter *padapter, struct recv_frame *precv_frame)
process_p2p_ps_ie(padapter, (pframe + WLAN_HDR_A3_LEN), (len - WLAN_HDR_A3_LEN));
}
} else if ((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE) {
- psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe));
+ psta = rtw_get_stainfo(pstapriv, mgmt->sa);
if (psta) {
/* update WMM, ERP in the beacon */
/* todo: the timer is used instead of the number of the beacon received */
@@ -621,8 +621,7 @@ static void OnBeacon(struct adapter *padapter, struct recv_frame *precv_frame)
pmlmeext->TSFValue = le64_to_cpu(mgmt->u.beacon.timestamp);
- /* report sta add event */
- report_add_sta_event(padapter, GetAddr2Ptr(pframe), cam_idx);
+ report_add_sta_event(padapter, mgmt->sa, cam_idx);
}
}
}
--
2.30.2
next prev parent reply other threads:[~2022-11-26 16:02 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-26 16:01 [PATCH 00/10] staging: r8188eu: clean up OnBeacon Martin Kaiser
2022-11-26 16:01 ` [PATCH 01/10] staging: r8188eu: replace one GetAddr3Ptr call Martin Kaiser
2022-11-26 16:01 ` [PATCH 02/10] staging: r8188eu: read timestamp from ieee80211_mgmt Martin Kaiser
2022-11-26 16:01 ` Martin Kaiser [this message]
2022-11-26 16:01 ` [PATCH 04/10] staging: r8188eu: pass only ies to process_p2p_ps_ie Martin Kaiser
2022-11-26 16:01 ` [PATCH 05/10] staging: r8188eu: use ie buffer in update_beacon_info Martin Kaiser
2022-11-26 16:01 ` [PATCH 06/10] staging: r8188eu: simplify update_sta_support_rate params Martin Kaiser
2022-11-26 16:01 ` [PATCH 07/10] staging: r8188eu: exit if beacon is not from our bss Martin Kaiser
2022-11-26 16:01 ` [PATCH 08/10] staging: r8188eu: stop beacon processing if kmalloc fails Martin Kaiser
2022-11-26 16:01 ` [PATCH 09/10] staging: r8188eu: simplify error handling for missing station Martin Kaiser
2022-11-26 16:01 ` [PATCH 10/10] staging: r8188eu: remove a variable Martin Kaiser
2022-11-27 14:45 ` [PATCH 00/10] staging: r8188eu: clean up OnBeacon Philipp Hortmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221126160129.178697-4-martin@kaiser.cx \
--to=martin@kaiser.cx \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=paskripkin@gmail.com \
--cc=phil@philpotter.co.uk \
--cc=straube.linux@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®