3.16.51-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Avraham Stern avraham.stern@intel.com
commit 6e46d8ce894374fc135c96a8d1057c6af1fef237 upstream.
When HW ROC is supported it is possible that after the HW notified that the ROC has started, the ROC was cancelled and another ROC was added while the hw_roc_start worker is waiting on the mutex (since cancelling the ROC and adding another one also holds the same mutex). As a result, the hw_roc_start worker will continue to run after the new ROC is added but before it is actually started by the HW. This may result in notifying userspace that the ROC has started before it actually does, or in case of management tx ROC, in an attempt to tx while not on the right channel.
In addition, when the driver will notify mac80211 that the second ROC has started, mac80211 will warn that this ROC has already been notified.
Fix this by flushing the hw_roc_start work before cancelling an ROC.
Signed-off-by: Avraham Stern avraham.stern@intel.com Signed-off-by: Luca Coelho luciano.coelho@intel.com Signed-off-by: Johannes Berg johannes.berg@intel.com [bwh: Backported to 3.16: adjust filename] Signed-off-by: Ben Hutchings ben@decadent.org.uk --- net/mac80211/cfg.c | 2 ++ 1 file changed, 2 insertions(+)
--- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -2891,6 +2891,8 @@ static int ieee80211_cancel_roc(struct i struct ieee80211_roc_work *roc, *tmp, *found = NULL; int ret;
+ flush_work(&local->hw_roc_start); + mutex_lock(&local->mtx); list_for_each_entry_safe(roc, tmp, &local->roc_list, list) { struct ieee80211_roc_work *dep, *tmp2;