mac80211: only set CSA beacon when at least one beacon must be transmitted

A beacon should never have a Channel Switch Announcement information
element with a count of 0, because a count of 1 means switch just
before the next beacon.  So, if a count of 0 was valid in a beacon, it
would have been transmitted in the next channel already, which is
useless.  A CSA count equal to zero is only meaningful in action
frames or probe_responses.

Fix the ieee80211_csa_is_complete() and ieee80211_update_csa()
functions accordingly.

With a CSA count of 0, we won't transmit any CSA beacons, because the
switch will happen before the next TBTT.  To avoid extra work and
potential confusion in the drivers, complete the CSA immediately,
instead of waiting for the driver to call ieee80211_csa_finish().

To keep things simpler, we also switch immediately when the CSA count
is 1, while in theory we should delay the switch until just before the
next TBTT.

Additionally, move the ieee80211_csa_finish() function to cfg.c,
where it makes more sense.

Tested-by: Simon Wunderlich <sw@simonwunderlich.de>
Acked-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 7 insertions, 12 deletions

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 27c990bf2320..bb990ecfa655 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -2402,15 +2402,6 @@ static int ieee80211_beacon_add_tim(struct ieee80211_sub_if_data *sdata,
         return 0;
 }
 
-void ieee80211_csa_finish(struct ieee80211_vif *vif)
-{
-        struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
-
-        ieee80211_queue_work(&sdata->local->hw,
-                             &sdata->csa_finalize_work);
-}
-EXPORT_SYMBOL(ieee80211_csa_finish);
-
 static void ieee80211_update_csa(struct ieee80211_sub_if_data *sdata,
                                  struct beacon_data *beacon)
 {
@@ -2439,8 +2430,12 @@ static void ieee80211_update_csa(struct ieee80211_sub_if_data *sdata,
         if (WARN_ON(counter_offset_beacon >= beacon_data_len))
                 return;
 
-        /* warn if the driver did not check for/react to csa completeness */
-        if (WARN_ON(beacon_data[counter_offset_beacon] == 0))
+        /* Warn if the driver did not check for/react to csa
+         * completeness.  A beacon with CSA counter set to 0 should
+         * never occur, because a counter of 1 means switch just
+         * before the next beacon.
+         */
+        if (WARN_ON(beacon_data[counter_offset_beacon] == 1))
                 return;
 
         beacon_data[counter_offset_beacon]--;
@@ -2506,7 +2501,7 @@ bool ieee80211_csa_is_complete(struct ieee80211_vif *vif)
         if (WARN_ON(counter_beacon > beacon_data_len))
                 goto out;
 
-        if (beacon_data[counter_beacon] == 0)
+        if (beacon_data[counter_beacon] == 1)
                 ret = true;
  out:
         rcu_read_unlock();