CHROMIUM: mac80211: prevent work queueing while quiescing on suspend

Do not emit a warning in that case, since there is nothing else in mac80211
that would effectively prevent more work from being queued.

BUG=chrome-os-partner:10785
TEST=per crosbug.com/p/10785#c54

Change-Id: Ic14aee400184772cbe19af65f01de11f683559fe
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: mukesh agrawal <quiche@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/32602

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 630462c..b9fea6c 100644 (file)
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -534,6 +534,9 @@ EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces_atomic);
  */
 static bool ieee80211_can_queue_work(struct ieee80211_local *local)
 {
+       if (local->quiescing)
+               return false;
+
        if (WARN(local->suspended && !local->resuming,
                 "queueing ieee80211 work while going to suspend\n"))
                return false;