Revert "wifi: mac80211: fix RCU list iterations"

This reverts commit b0b2dc1eaa7ec509e07a78c9974097168ae565b7 which is
commit ac35180032fbc5d80b29af00ba4881815ceefcb6 upstream.

It should not have been backported here due to lack of other rcu
changes in the stable branches.

Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index 807bea1a7d3c1b6853facbe51d88392e35de1304..f07e34bed8f3aadb005c0a97ca6f6dd6a4e3e06f 100644 (file)
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -245,9 +245,7 @@ ieee80211_get_max_required_bw(struct ieee80211_sub_if_data *sdata,
        enum nl80211_chan_width max_bw = NL80211_CHAN_WIDTH_20_NOHT;
        struct sta_info *sta;
 
-       lockdep_assert_wiphy(sdata->local->hw.wiphy);
-
-       list_for_each_entry(sta, &sdata->local->sta_list, list) {
+       list_for_each_entry_rcu(sta, &sdata->local->sta_list, list) {
                if (sdata != sta->sdata &&
                    !(sta->sdata->bss && sta->sdata->bss == sdata->bss))
                        continue;

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index ee9ec74b9553f9f72372a1105ec4d2c6c1416852..9a5530ca2f6b235a113468b4bd9ce5418bcc4148 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -660,7 +660,7 @@ static bool ieee80211_add_vht_ie(struct ieee80211_sub_if_data *sdata,
                bool disable_mu_mimo = false;
                struct ieee80211_sub_if_data *other;
 
-               list_for_each_entry(other, &local->interfaces, list) {
+               list_for_each_entry_rcu(other, &local->interfaces, list) {
                        if (other->vif.bss_conf.mu_mimo_owner) {
                                disable_mu_mimo = true;
                                break;

diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index edbf468e0bea3717c1c310ccbf068bcbf8e30414..f1147d156c1f30d1860081298c0b6951462acd31 100644 (file)
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -501,7 +501,7 @@ static void __ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted)
         * the scan was in progress; if there was none this will
         * just be a no-op for the particular interface.
         */
-       list_for_each_entry(sdata, &local->interfaces, list) {
+       list_for_each_entry_rcu(sdata, &local->interfaces, list) {
                if (ieee80211_sdata_running(sdata))
                        ieee80211_queue_work(&sdata->local->hw, &sdata->work);
        }

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 3fe15089b24f5dc661c8f978b4d0ee3a0353da51..738f1f139a90eebfbf18bbdbb2a286c4aa2ee338 100644 (file)
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -767,9 +767,7 @@ static void __iterate_interfaces(struct ieee80211_local *local,
        struct ieee80211_sub_if_data *sdata;
        bool active_only = iter_flags & IEEE80211_IFACE_ITER_ACTIVE;
 
-       list_for_each_entry_rcu(sdata, &local->interfaces, list,
-                               lockdep_is_held(&local->iflist_mtx) ||
-                               lockdep_is_held(&local->hw.wiphy->mtx)) {
+       list_for_each_entry_rcu(sdata, &local->interfaces, list) {
                switch (sdata->vif.type) {
                case NL80211_IFTYPE_MONITOR:
                        if (!(sdata->u.mntr.flags & MONITOR_FLAG_ACTIVE))