From: Johannes Berg <johannes.berg@xxxxxxxxx>
commit 3caf31e7b18a90b74a2709d761a0dfa423f2c2e4 upstream.
This documentation wasn't added in the original patch,
add it now.
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Fixes: 6e4c0d0460bd ("wifi: mac80211: add a workaround for receiving non-standard mesh A-MSDU")
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/mac80211/sta_info.h | 2 ++
1 file changed, 2 insertions(+)
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -621,6 +621,8 @@ struct link_sta_info {
* taken from HT/VHT capabilities or VHT operating mode notification
* @cparams: CoDel parameters for this station.
* @reserved_tid: reserved TID (if any, otherwise IEEE80211_TID_UNRESERVED)
+ * @amsdu_mesh_control: track the mesh A-MSDU format used by the peer
+ * (-1: not yet known, 0: non-standard [without mesh header], 1: standard)
* @fast_tx: TX fastpath information
* @fast_rx: RX fastpath information
* @tdls_chandef: a TDLS peer can have a wider chandef that is compatible to
Patches currently in stable-queue which might be from johannes.berg@xxxxxxxxx are
queue-6.1/wifi-mac80211-fix-change_address-deadlock-during-unr.patch
queue-6.1/wifi-mac80211-take-wiphy-lock-for-mac-addr-change.patch
queue-6.1/wifi-mac80211-fix-ba-session-teardown-race.patch
queue-6.1/wifi-cfg80211-check-a-msdu-format-more-carefully.patch
queue-6.1/wifi-mac80211-fix-potential-null-pointer-dereference.patch
queue-6.1/wifi-mac80211-fix-mesh-path-discovery-based-on-unicast-packets.patch
queue-6.1/wifi-mac80211-fix-mesh-forwarding.patch
queue-6.1/wifi-mac80211-fix-receiving-a-msdu-frames-on-mesh-in.patch
queue-6.1/wifi-mac80211-fix-flow-dissection-for-forwarded-packets.patch
queue-6.1/wifi-mac80211-drop-bogus-static-keywords-in-a-msdu-rx.patch
queue-6.1/wifi-cfg80211-factor-out-bridge-tunnel-rfc1042-heade.patch
queue-6.1/wifi-mac80211-fix-receiving-mesh-packets-in-forwarding-0-networks.patch
queue-6.1/wifi-mac80211-add-documentation-for-amsdu_mesh_control.patch
queue-6.1/wifi-mac80211-fix-and-simplify-unencrypted-drop-chec.patch
queue-6.1/wifi-mac80211-remove-mesh-forwarding-congestion-chec.patch
queue-6.1/wifi-cfg80211-move-a-msdu-check-in-ieee80211_data_to.patch
queue-6.1/wifi-iwlwifi-abort-scan-when-rfkill-on-but-device-en.patch
queue-6.1/wifi-mac80211-add-a-workaround-for-receiving-non-sta.patch
queue-6.1/wifi-cfg80211-check-wiphy-mutex-is-held-for-wdev-mut.patch
queue-6.1/wifi-iwlwifi-fw-fix-debugfs-command-sending.patch
