summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2023-05-15 17:16:04 -0700
committeriwlwifi publisher <>2023-06-01 07:34:57 +0000
commitb758b1d3f157ceb8b473a4d9b8b7e5288f6e6d2e (patch)
treead4425e590c770046dc82e329e192af9b4835229
parentd783353adf8fb756ac4f9fb06b8671d7ef986910 (diff)
downloadbackport-iwlwifi-b758b1d3f157ceb8b473a4d9b8b7e5288f6e6d2e.tar.gz
wifi: mac80211: allow for_each_sta_active_link() under RCU
Since we only use this to protect the dereference and with STA mutex, we can also allow this with just RCU. type=feature ticket=none Change-Id: I52ef396d693e0e381a73eade06850137d8900948 Signed-off-by: Johannes Berg <johannes.berg@intel.com> Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/55699 tested: iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> automatic-review: iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> Reviewed-by: Greenman, Gregory <gregory.greenman@intel.com> x-iwlwifi-stack-dev: e288c143d4a190a544f913a65851457ec98e4e99
-rw-r--r--include/net/mac80211.h2
-rw-r--r--versions2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 3347c36c0c..3b6c85d075 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -2400,7 +2400,7 @@ static inline bool lockdep_sta_mutex_held(struct ieee80211_sta *pubsta)
for (link_id = 0; link_id < ARRAY_SIZE((sta)->link); link_id++) \
if ((!(vif)->active_links || \
(vif)->active_links & BIT(link_id)) && \
- ((link_sta) = link_sta_dereference_protected(sta, link_id)))
+ ((link_sta) = link_sta_dereference_check(sta, link_id)))
/**
* enum sta_notify_cmd - sta notify command
diff --git a/versions b/versions
index 5c73ea9b61..9e715f5efd 100644
--- a/versions
+++ b/versions
@@ -2,4 +2,4 @@ BACKPORTS_VERSION="(see git)"
BACKPORTED_KERNEL_VERSION="(see git)"
BACKPORTED_KERNEL_NAME="iwlwifi"
BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__
-BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11233:94f8028c"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11234:e288c143"