forked from coolsnowwolf/lede
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
mac80211: backport merged version of A-MSDU mesh patch
This issue was fixed in the final version of ("wifi: mac80211: fix receiving A-MSDU frames on mesh interfaces") that was merged upstream but we have a older version that is using: memcpy(&payload.eth.h_dest, mesh_addr, 2 * ETH_ALEN); instead of: memcpy(&payload.eth, mesh_addr, 2 * ETH_ALEN); So, lets just backport the merged version of patch to fix the issue. Signed-off-by: Robert Marko <[email protected]>
- Loading branch information
Showing
2 changed files
with
12 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
From 986e43b19ae9176093da35e0a844e65c8bf9ede7 Mon Sep 17 00:00:00 2001 | ||
From: Felix Fietkau <[email protected]> | ||
Date: Tue, 6 Dec 2022 11:15:02 +0100 | ||
Date: Mon, 13 Feb 2023 11:08:54 +0100 | ||
Subject: [PATCH] wifi: mac80211: fix receiving A-MSDU frames on mesh | ||
interfaces | ||
|
||
|
@@ -33,7 +34,15 @@ For locally received packets, the Mesh Control header is stripped away. | |
For forwarded packets, a new 802.11 header gets added. | ||
|
||
Signed-off-by: Felix Fietkau <[email protected]> | ||
Link: https://lore.kernel.org/r/[email protected] | ||
[fix fortify build error] | ||
Signed-off-by: Johannes Berg <[email protected]> | ||
--- | ||
.../wireless/marvell/mwifiex/11n_rxreorder.c | 2 +- | ||
include/net/cfg80211.h | 27 +- | ||
net/mac80211/rx.c | 350 ++++++++++-------- | ||
net/wireless/util.c | 120 +++--- | ||
4 files changed, 297 insertions(+), 202 deletions(-) | ||
|
||
--- a/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c | ||
+++ b/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c | ||
|
@@ -557,7 +566,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
+ memcpy(&payload.eth.h_source, mesh_addr, ETH_ALEN); | ||
+ break; | ||
+ case MESH_FLAGS_AE_A5_A6: | ||
+ memcpy(&payload.eth.h_dest, mesh_addr, 2 * ETH_ALEN); | ||
+ memcpy(&payload.eth, mesh_addr, 2 * ETH_ALEN); | ||
+ break; | ||
+ default: | ||
+ break; | ||
|