mac80211: fix channel context iteration

During suspend/resume channel contexts might be
iterated even if they haven't been re-added to
the driver, keep track of this and skip them in
iteration. Also use the new status for sanity
checks.

Also clarify the fact that during HW restart all
contexts are iterated over (thanks Eliad.)

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 12 insertions, 3 deletions

diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index 698dc7e6f309..608ced41548d 100644
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -913,6 +913,8 @@ static inline int drv_add_chanctx(struct ieee80211_local *local,
         if (local->ops->add_chanctx)
                 ret = local->ops->add_chanctx(&local->hw, &ctx->conf);
         trace_drv_return_int(local, ret);
+        if (!ret)
+                ctx->driver_present = true;
 
         return ret;
 }
@@ -924,6 +926,7 @@ static inline void drv_remove_chanctx(struct ieee80211_local *local,
         if (local->ops->remove_chanctx)
                 local->ops->remove_chanctx(&local->hw, &ctx->conf);
         trace_drv_return_void(local);
+        ctx->driver_present = false;
 }
 
 static inline void drv_change_chanctx(struct ieee80211_local *local,
@@ -931,8 +934,10 @@ static inline void drv_change_chanctx(struct ieee80211_local *local,
                                       u32 changed)
 {
         trace_drv_change_chanctx(local, ctx, changed);
-        if (local->ops->change_chanctx)
+        if (local->ops->change_chanctx) {
+                WARN_ON_ONCE(!ctx->driver_present);
                 local->ops->change_chanctx(&local->hw, &ctx->conf, changed);
+        }
         trace_drv_return_void(local);
 }
 
@@ -945,10 +950,12 @@ static inline int drv_assign_vif_chanctx(struct ieee80211_local *local,
         check_sdata_in_driver(sdata);
 
         trace_drv_assign_vif_chanctx(local, sdata, ctx);
-        if (local->ops->assign_vif_chanctx)
+        if (local->ops->assign_vif_chanctx) {
+                WARN_ON_ONCE(!ctx->driver_present);
                 ret = local->ops->assign_vif_chanctx(&local->hw,
                                                      &sdata->vif,
                                                      &ctx->conf);
+        }
         trace_drv_return_int(local, ret);
 
         return ret;
@@ -961,10 +968,12 @@ static inline void drv_unassign_vif_chanctx(struct ieee80211_local *local,
         check_sdata_in_driver(sdata);
 
         trace_drv_unassign_vif_chanctx(local, sdata, ctx);
-        if (local->ops->unassign_vif_chanctx)
+        if (local->ops->unassign_vif_chanctx) {
+                WARN_ON_ONCE(!ctx->driver_present);
                 local->ops->unassign_vif_chanctx(&local->hw,
                                                  &sdata->vif,
                                                  &ctx->conf);
+        }
         trace_drv_return_void(local);
 }