mac80211: introduce hw config change flags

This makes mac80211 notify the driver which configuration
actually changed, e.g. channel etc.

No driver changes, this is just plumbing, driver authors are
expected to act on this if they want to.

Also remove the HW CONFIG debug printk, it's incorrect, often
we configure something else.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 16 insertions, 13 deletions

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 07f812755e55..c936017f6d48 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -197,31 +197,34 @@ int ieee80211_if_config(struct ieee80211_sub_if_data *sdata, u32 changed)
                                             &sdata->vif, &conf);
 }
 
-int ieee80211_hw_config(struct ieee80211_local *local)
+int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
 {
         struct ieee80211_channel *chan;
         int ret = 0;
+        int power;
 
         if (local->sw_scanning)
                 chan = local->scan_channel;
         else
                 chan = local->oper_channel;
 
-        local->hw.conf.channel = chan;
+        if (chan != local->hw.conf.channel) {
+                local->hw.conf.channel = chan;
+                changed |= IEEE80211_CONF_CHANGE_CHANNEL;
+        }
+
 
         if (!local->hw.conf.power_level)
-                local->hw.conf.power_level = chan->max_power;
+                power = chan->max_power;
         else
-                local->hw.conf.power_level = min(chan->max_power,
-                                               local->hw.conf.power_level);
-
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        printk(KERN_DEBUG "%s: HW CONFIG: freq=%d\n",
-               wiphy_name(local->hw.wiphy), chan->center_freq);
-#endif
+                power = min(chan->max_power, local->hw.conf.power_level);
+        if (local->hw.conf.power_level != power) {
+                changed |= IEEE80211_CONF_CHANGE_POWER;
+                local->hw.conf.power_level = power;
+        }
 
-        if (local->open_count) {
-                ret = local->ops->config(local_to_hw(local), &local->hw.conf);
+        if (changed && local->open_count) {
+                ret = local->ops->config(local_to_hw(local), changed);
                 /*
                  * HW reconfiguration should never fail, the driver has told
                  * us what it can support so it should live up to that promise.
@@ -672,7 +675,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
         local->fragmentation_threshold = IEEE80211_MAX_FRAG_THRESHOLD;
         local->short_retry_limit = 7;
         local->long_retry_limit = 4;
-        local->hw.conf.radio_enabled = 1;
+        local->hw.conf.radio_enabled = true;
 
         INIT_LIST_HEAD(&local->interfaces);