mac80211: batch CSA bss info notification

Instead of having
ieee80211_bss_info_change_notify() scattered all
over the place just call it once when finalizing
CSA.

As a side effect this patch adds missing error
checking for IBSS CSA beacon update.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
[fix err vs. changed variable usage in ieee80211_csa_finalize()]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 3 insertions, 4 deletions

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index ed7eec3f6ee0..82d3d14b03c5 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -530,7 +530,7 @@ int ieee80211_ibss_finish_csa(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
         struct cfg80211_bss *cbss;
-        int err;
+        int err, changed = 0;
         u16 capability;
 
         sdata_assert_lock(sdata);
@@ -562,10 +562,9 @@ int ieee80211_ibss_finish_csa(struct ieee80211_sub_if_data *sdata)
         if (err < 0)
                 return err;
 
-        if (err)
-                ieee80211_bss_info_change_notify(sdata, err);
+        changed |= err;
 
-        return 0;
+        return changed;
 }
 
 void ieee80211_ibss_stop(struct ieee80211_sub_if_data *sdata)