drop wifi-cfg80211-fix-locking-in-regulatory-disconnect.patch from everywhere

diff --git a/queue-5.15/series b/queue-5.15/series
index 450d3df06ad1aa3f445cf00b9c86d313290f370d..51ff7a107aaab77de4771f4f0c19783e17536860 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -25,7 +25,6 @@ bluetooth-fix-l2cap_disconnect_req-deadlock.patch
 bluetooth-l2cap-add-missing-checks-for-invalid-dcid.patch
 qed-qede-fix-scheduling-while-atomic.patch
 wifi-cfg80211-fix-locking-in-sched-scan-stop-work.patch
-wifi-cfg80211-fix-locking-in-regulatory-disconnect.patch
 selftests-bpf-verify-optval-null-case.patch
 selftests-bpf-fix-sockopt_sk-selftest.patch
 netfilter-conntrack-fix-null-pointer-dereference-in-.patch

diff --git a/queue-5.15/wifi-cfg80211-fix-locking-in-regulatory-disconnect.patch b/queue-5.15/wifi-cfg80211-fix-locking-in-regulatory-disconnect.patch
deleted file mode 100644 (file)
index 1176cb9..0000000
--- a/queue-5.15/wifi-cfg80211-fix-locking-in-regulatory-disconnect.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 7cdaf883ec16963a7c32c4efb821a3518c3533a4 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 6 Jun 2023 14:34:48 +0200
-Subject: wifi: cfg80211: fix locking in regulatory disconnect
-
-From: Johannes Berg <johannes.berg@intel.com>
-
-[ Upstream commit f7e60032c6618dfd643c7210d5cba2789e2de2e2 ]
-
-This should use wiphy_lock() now instead of requiring the
-RTNL, since __cfg80211_leave() via cfg80211_leave() is now
-requiring that lock to be held.
-
-Fixes: a05829a7222e ("cfg80211: avoid holding the RTNL when calling the driver")
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/wireless/reg.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/net/wireless/reg.c b/net/wireless/reg.c
-index d0fbe822e7934..0e49264ce1f67 100644
---- a/net/wireless/reg.c
-+++ b/net/wireless/reg.c
-@@ -2423,11 +2423,11 @@ static void reg_leave_invalid_chans(struct wiphy *wiphy)
-       struct wireless_dev *wdev;
-       struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy);
- 
--      ASSERT_RTNL();
--
-+      wiphy_lock(wiphy);
-       list_for_each_entry(wdev, &rdev->wiphy.wdev_list, list)
-               if (!reg_wdev_chan_valid(wiphy, wdev))
-                       cfg80211_leave(rdev, wdev);
-+      wiphy_unlock(wiphy);
- }
- 
- static void reg_check_chans_work(struct work_struct *work)
--- 
-2.39.2
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 9e76771529f94d7a7d6f16c83cdb00c20acb13cd..581059b6361bb171385d3035b12b9274e34a19d0 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -29,7 +29,6 @@ wifi-mac80211-mlme-fix-non-inheritence-element.patch
 wifi-mac80211-don-t-translate-beacon-presp-addrs.patch
 qed-qede-fix-scheduling-while-atomic.patch
 wifi-cfg80211-fix-locking-in-sched-scan-stop-work.patch
-wifi-cfg80211-fix-locking-in-regulatory-disconnect.patch
 selftests-bpf-verify-optval-null-case.patch
 selftests-bpf-fix-sockopt_sk-selftest.patch
 netfilter-nft_bitwise-fix-register-tracking.patch

diff --git a/queue-6.1/wifi-cfg80211-fix-locking-in-regulatory-disconnect.patch b/queue-6.1/wifi-cfg80211-fix-locking-in-regulatory-disconnect.patch
deleted file mode 100644 (file)
index d6233e0..0000000
--- a/queue-6.1/wifi-cfg80211-fix-locking-in-regulatory-disconnect.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 419fd79aac2c2cc301761cfb9cf178fc20072432 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 6 Jun 2023 14:34:48 +0200
-Subject: wifi: cfg80211: fix locking in regulatory disconnect
-
-From: Johannes Berg <johannes.berg@intel.com>
-
-[ Upstream commit f7e60032c6618dfd643c7210d5cba2789e2de2e2 ]
-
-This should use wiphy_lock() now instead of requiring the
-RTNL, since __cfg80211_leave() via cfg80211_leave() is now
-requiring that lock to be held.
-
-Fixes: a05829a7222e ("cfg80211: avoid holding the RTNL when calling the driver")
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/wireless/reg.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/net/wireless/reg.c b/net/wireless/reg.c
-index 4f3f31244e8ba..50b16e643f381 100644
---- a/net/wireless/reg.c
-+++ b/net/wireless/reg.c
-@@ -2478,11 +2478,11 @@ static void reg_leave_invalid_chans(struct wiphy *wiphy)
-       struct wireless_dev *wdev;
-       struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy);
- 
--      ASSERT_RTNL();
--
-+      wiphy_lock(wiphy);
-       list_for_each_entry(wdev, &rdev->wiphy.wdev_list, list)
-               if (!reg_wdev_chan_valid(wiphy, wdev))
-                       cfg80211_leave(rdev, wdev);
-+      wiphy_unlock(wiphy);
- }
- 
- static void reg_check_chans_work(struct work_struct *work)
--- 
-2.39.2
-

diff --git a/queue-6.3/series b/queue-6.3/series
index cdb6b98f0d04673b9b3712b277a503c2002f4f14..6072383d9168e414b31de416bb2962968e9e4282 100644 (file)
--- a/queue-6.3/series
+++ b/queue-6.3/series
@@ -35,7 +35,6 @@ qed-qede-fix-scheduling-while-atomic.patch
 accel-ivpu-ivpu_ipc-needs-generic_allocator.patch
 accel-ivpu-reserve-all-non-command-bo-s-using-dma_re.patch
 wifi-cfg80211-fix-locking-in-sched-scan-stop-work.patch
-wifi-cfg80211-fix-locking-in-regulatory-disconnect.patch
 selftests-bpf-verify-optval-null-case.patch
 selftests-bpf-fix-sockopt_sk-selftest.patch
 netfilter-nf_tables-add-null-check-for-nla_nest_star.patch

diff --git a/queue-6.3/wifi-cfg80211-fix-locking-in-regulatory-disconnect.patch b/queue-6.3/wifi-cfg80211-fix-locking-in-regulatory-disconnect.patch
deleted file mode 100644 (file)
index 142cc80..0000000
--- a/queue-6.3/wifi-cfg80211-fix-locking-in-regulatory-disconnect.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2bfe8165ee81b54f0868f62da04242111d2f0ad6 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 6 Jun 2023 14:34:48 +0200
-Subject: wifi: cfg80211: fix locking in regulatory disconnect
-
-From: Johannes Berg <johannes.berg@intel.com>
-
-[ Upstream commit f7e60032c6618dfd643c7210d5cba2789e2de2e2 ]
-
-This should use wiphy_lock() now instead of requiring the
-RTNL, since __cfg80211_leave() via cfg80211_leave() is now
-requiring that lock to be held.
-
-Fixes: a05829a7222e ("cfg80211: avoid holding the RTNL when calling the driver")
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/wireless/reg.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/net/wireless/reg.c b/net/wireless/reg.c
-index 0d40d6af7e10a..949e1fb3bec67 100644
---- a/net/wireless/reg.c
-+++ b/net/wireless/reg.c
-@@ -2440,11 +2440,11 @@ static void reg_leave_invalid_chans(struct wiphy *wiphy)
-       struct wireless_dev *wdev;
-       struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy);
- 
--      ASSERT_RTNL();
--
-+      wiphy_lock(wiphy);
-       list_for_each_entry(wdev, &rdev->wiphy.wdev_list, list)
-               if (!reg_wdev_chan_valid(wiphy, wdev))
-                       cfg80211_leave(rdev, wdev);
-+      wiphy_unlock(wiphy);
- }
- 
- static void reg_check_chans_work(struct work_struct *work)
--- 
-2.39.2
-