summaryrefslogtreecommitdiffstats
path: root/net/mac80211/offchannel.c
diff options
context:
space:
mode:
authorEliad Peller2015-12-14 15:26:57 +0100
committerJohannes Berg2016-01-14 11:10:14 +0100
commit470f4d613b51806e15e055428234a04a99f076fc (patch)
treeda223fd2bd22e92c56da22c923da87ffa4707769 /net/mac80211/offchannel.c
parentregulatory: fix world regulatory domain data (diff)
downloadkernel-qcow2-linux-470f4d613b51806e15e055428234a04a99f076fc.tar.gz
kernel-qcow2-linux-470f4d613b51806e15e055428234a04a99f076fc.tar.xz
kernel-qcow2-linux-470f4d613b51806e15e055428234a04a99f076fc.zip
mac80211: avoid ROC during hw restart
Defer ROC requests during hw restart, as the driver might not be fully configured in this stage (e.g. channel contexts were not added yet) Signed-off-by: Eliad Peller <eliadx.peller@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/offchannel.c')
-rw-r--r--net/mac80211/offchannel.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c
index fbc34e9088de..55a9c5b94ce1 100644
--- a/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
@@ -408,6 +408,10 @@ void ieee80211_start_next_roc(struct ieee80211_local *local)
return;
}
+ /* defer roc if driver is not started (i.e. during reconfig) */
+ if (local->in_reconfig)
+ return;
+
roc = list_first_entry(&local->roc_list, struct ieee80211_roc_work,
list);