From 551763331de1c3268114293a366e597c66f2847b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 15 May 2024 09:56:36 +0200 Subject: [PATCH] 6.9-stable patches added patches: wifi-mt76-mt7915-add-missing-chanctx-ops.patch --- queue-6.9/series | 1 + ...-mt76-mt7915-add-missing-chanctx-ops.patch | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 queue-6.9/wifi-mt76-mt7915-add-missing-chanctx-ops.patch diff --git a/queue-6.9/series b/queue-6.9/series index 9279224f290..94d1ac387fd 100644 --- a/queue-6.9/series +++ b/queue-6.9/series @@ -2,3 +2,4 @@ vfio-add-the-spr_dsa-and-spr_iax-devices-to-the-denylist.patch dmaengine-idxd-add-a-new-security-check-to-deal-with-a-hardware-erratum.patch dmaengine-idxd-add-a-write-method-for-applications-to-submit-work.patch keys-fix-overwrite-of-key-expiration-on-instantiation.patch +wifi-mt76-mt7915-add-missing-chanctx-ops.patch diff --git a/queue-6.9/wifi-mt76-mt7915-add-missing-chanctx-ops.patch b/queue-6.9/wifi-mt76-mt7915-add-missing-chanctx-ops.patch new file mode 100644 index 00000000000..65d6b00a113 --- /dev/null +++ b/queue-6.9/wifi-mt76-mt7915-add-missing-chanctx-ops.patch @@ -0,0 +1,39 @@ +From 2f7cf3b61d85228ae749b6cb8eda1e1df9d4926f Mon Sep 17 00:00:00 2001 +From: Ben Greear +Date: Tue, 26 Mar 2024 17:11:31 -0700 +Subject: wifi: mt76: mt7915: add missing chanctx ops + +From: Ben Greear + +commit 2f7cf3b61d85228ae749b6cb8eda1e1df9d4926f upstream. + +Looks like this was missed in the initial patch that made +the conversion to the emulated chanctx drivers. + +Fixes: 0a44dfc07074 ("wifi: mac80211: simplify non-chanctx drivers") +Tested-by: James Courtier-Dutton +Signed-off-by: Ben Greear +Signed-off-by: Felix Fietkau +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c +index b16a63366907..2624edbb59a1 100644 +--- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c ++++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c +@@ -1661,6 +1661,10 @@ mt7915_net_fill_forward_path(struct ieee80211_hw *hw, + #endif + + const struct ieee80211_ops mt7915_ops = { ++ .add_chanctx = ieee80211_emulate_add_chanctx, ++ .remove_chanctx = ieee80211_emulate_remove_chanctx, ++ .change_chanctx = ieee80211_emulate_change_chanctx, ++ .switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx, + .tx = mt7915_tx, + .start = mt7915_start, + .stop = mt7915_stop, +-- +2.45.0 + -- 2.47.3