* [PATCH 0/2] clean up sta2sta_data_frame
@ 2022-07-07 19:49 Martin Kaiser
2022-07-07 19:49 ` [PATCH 1/2] staging: r8188eu: remove sta2sta_data_frame prototype Martin Kaiser
2022-07-07 19:49 ` [PATCH 2/2] staging: r8188eu: pattrib addresses were already set by the caller Martin Kaiser
0 siblings, 2 replies; 3+ messages in thread
From: Martin Kaiser @ 2022-07-07 19:49 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, Pavel Skripkin,
linux-staging, linux-kernel, Martin Kaiser
Two patches that clean up the sta2sta_data_frame function.
Martin Kaiser (2):
staging: r8188eu: remove sta2sta_data_frame prototype
staging: r8188eu: pattrib addresses were already set by the caller
drivers/staging/r8188eu/core/rtw_recv.c | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
--
2.30.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/2] staging: r8188eu: remove sta2sta_data_frame prototype
2022-07-07 19:49 [PATCH 0/2] clean up sta2sta_data_frame Martin Kaiser
@ 2022-07-07 19:49 ` Martin Kaiser
2022-07-07 19:49 ` [PATCH 2/2] staging: r8188eu: pattrib addresses were already set by the caller Martin Kaiser
1 sibling, 0 replies; 3+ messages in thread
From: Martin Kaiser @ 2022-07-07 19:49 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, Pavel Skripkin,
linux-staging, linux-kernel, Martin Kaiser
Remove the prototype for sta2sta_data_frame. Make the function static, it
is used only inside rtw_recv.c.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/core/rtw_recv.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r8188eu/core/rtw_recv.c
index 32cd452d1f3d..6a2a1b1664ac 100644
--- a/drivers/staging/r8188eu/core/rtw_recv.c
+++ b/drivers/staging/r8188eu/core/rtw_recv.c
@@ -556,13 +556,8 @@ static void count_rx_stats(struct adapter *padapter, struct recv_frame *prframe,
}
}
-int sta2sta_data_frame(
- struct adapter *adapter,
- struct recv_frame *precv_frame,
- struct sta_info **psta
-);
-
-int sta2sta_data_frame(struct adapter *adapter, struct recv_frame *precv_frame, struct sta_info **psta)
+static int sta2sta_data_frame(struct adapter *adapter,
+ struct recv_frame *precv_frame, struct sta_info **psta)
{
u8 *ptr = precv_frame->rx_data;
int ret = _SUCCESS;
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] staging: r8188eu: pattrib addresses were already set by the caller
2022-07-07 19:49 [PATCH 0/2] clean up sta2sta_data_frame Martin Kaiser
2022-07-07 19:49 ` [PATCH 1/2] staging: r8188eu: remove sta2sta_data_frame prototype Martin Kaiser
@ 2022-07-07 19:49 ` Martin Kaiser
1 sibling, 0 replies; 3+ messages in thread
From: Martin Kaiser @ 2022-07-07 19:49 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, Pavel Skripkin,
linux-staging, linux-kernel, Martin Kaiser
Do not set pattrib's src, dst, bssid, ra and ta again in
sta2sta_data_frame.
sta2sta_data_frame is called from validate_recv_data_frame when both to_ds
and from_ds are 0. All pattrib address fields have already been set to the
correct addresses when sta2sta_data_frame is called.
memcpy(pattrib->dst, ieee80211_get_DA(hdr), ETH_ALEN);
ieee80211_get_DA returns addr1 if to_ds and from_ds are 0
memcpy(pattrib->src, ieee80211_get_SA(hdr), ETH_ALEN);
ieee80211_get_SA returns addr2 if to_ds and from_ds are 0
memcpy(pattrib->ra, hdr->addr1, ETH_ALEN);
memcpy(pattrib->ta, hdr->addr2, ETH_ALEN);
For pattrib->dst == addr1, pattrib->src == addr2, these
assignments match those in sta2sta_data_frame that this
patch removes.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/core/rtw_recv.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r8188eu/core/rtw_recv.c
index 6a2a1b1664ac..e5a7b7dfc387 100644
--- a/drivers/staging/r8188eu/core/rtw_recv.c
+++ b/drivers/staging/r8188eu/core/rtw_recv.c
@@ -559,7 +559,6 @@ static void count_rx_stats(struct adapter *padapter, struct recv_frame *prframe,
static int sta2sta_data_frame(struct adapter *adapter,
struct recv_frame *precv_frame, struct sta_info **psta)
{
- u8 *ptr = precv_frame->rx_data;
int ret = _SUCCESS;
struct rx_pkt_attrib *pattrib = &precv_frame->attrib;
struct sta_priv *pstapriv = &adapter->stapriv;
@@ -614,12 +613,6 @@ static int sta2sta_data_frame(struct adapter *adapter,
sta_addr = pattrib->src;
}
} else if (check_fwstate(pmlmepriv, WIFI_MP_STATE)) {
- memcpy(pattrib->dst, GetAddr1Ptr(ptr), ETH_ALEN);
- memcpy(pattrib->src, GetAddr2Ptr(ptr), ETH_ALEN);
- memcpy(pattrib->bssid, GetAddr3Ptr(ptr), ETH_ALEN);
- memcpy(pattrib->ra, pattrib->dst, ETH_ALEN);
- memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
-
sta_addr = mybssid;
} else {
ret = _FAIL;
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-07 19:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-07 19:49 [PATCH 0/2] clean up sta2sta_data_frame Martin Kaiser
2022-07-07 19:49 ` [PATCH 1/2] staging: r8188eu: remove sta2sta_data_frame prototype Martin Kaiser
2022-07-07 19:49 ` [PATCH 2/2] staging: r8188eu: pattrib addresses were already set by the caller Martin Kaiser
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.