]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.6-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 23 Jul 2024 17:50:55 +0000 (19:50 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 23 Jul 2024 17:50:55 +0000 (19:50 +0200)
added patches:
wifi-iwlwifi-mvm-don-t-wake-up-rx_sync_waitq-upon-rfkill.patch

queue-6.6/series
queue-6.6/wifi-iwlwifi-mvm-don-t-wake-up-rx_sync_waitq-upon-rfkill.patch [new file with mode: 0644]

index 5c708d14db997a15f02c63e85b52d969ed2d9e41..2d7f4589f5f57b5bccd29c1312586c0eea3edbfa 100644 (file)
@@ -123,3 +123,4 @@ bluetooth-l2cap-fix-deadlock.patch
 of-irq-disable-interrupt-map-parsing-for-pasemi-nemo.patch
 wifi-cfg80211-wext-set-ssids-null-for-passive-scans.patch
 wifi-mac80211-disable-softirqs-for-queued-frame-handling.patch
+wifi-iwlwifi-mvm-don-t-wake-up-rx_sync_waitq-upon-rfkill.patch
diff --git a/queue-6.6/wifi-iwlwifi-mvm-don-t-wake-up-rx_sync_waitq-upon-rfkill.patch b/queue-6.6/wifi-iwlwifi-mvm-don-t-wake-up-rx_sync_waitq-upon-rfkill.patch
new file mode 100644 (file)
index 0000000..654d1e4
--- /dev/null
@@ -0,0 +1,39 @@
+From e715c9302b1c6fae990b9898a80fac855549d1f0 Mon Sep 17 00:00:00 2001
+From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+Date: Wed, 3 Jul 2024 06:43:16 +0300
+Subject: wifi: iwlwifi: mvm: don't wake up rx_sync_waitq upon RFKILL
+
+From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+
+commit e715c9302b1c6fae990b9898a80fac855549d1f0 upstream.
+
+Since we now want to sync the queues even when we're in RFKILL, we
+shouldn't wake up the wait queue since we still expect to get all the
+notifications from the firmware.
+
+Fixes: 4d08c0b3357c ("wifi: iwlwifi: mvm: handle BA session teardown in RF-kill")
+Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
+Link: https://patch.msgid.link/20240703064027.be7a9dbeacde.I5586cb3ca8d6e44f79d819a48a0c22351ff720c9@changeid
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c |    6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
++++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+@@ -6094,11 +6094,9 @@ void iwl_mvm_sync_rx_queues_internal(str
+       if (sync) {
+               lockdep_assert_held(&mvm->mutex);
+               ret = wait_event_timeout(mvm->rx_sync_waitq,
+-                                       READ_ONCE(mvm->queue_sync_state) == 0 ||
+-                                       iwl_mvm_is_radio_killed(mvm),
++                                       READ_ONCE(mvm->queue_sync_state) == 0,
+                                        HZ);
+-              WARN_ONCE(!ret && !iwl_mvm_is_radio_killed(mvm),
+-                        "queue sync: failed to sync, state is 0x%lx\n",
++              WARN_ONCE(!ret, "queue sync: failed to sync, state is 0x%lx\n",
+                         mvm->queue_sync_state);
+       }