mac80211: clean up beacon interval settings

We currently have two beacon interval configuration knobs:
hw.conf.beacon_int and vif.bss_info.beacon_int. This is
rather confusing, even though the former is used when we
beacon ourselves and the latter when we are associated to
an AP.

This just deprecates the hw.conf.beacon_int setting in favour
of always using vif.bss_info.beacon_int. Since it touches all
the beaconing IBSS code anyway, we can also add support for
the cfg80211 IBSS beacon interval configuration easily.

NOTE: The hw.conf.beacon_int setting is retained for now due
      to drivers still using it -- I couldn't untangle all
      drivers, some are updated in this patch.

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

1 files changed, 12 insertions, 8 deletions

diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index d4fdc8b7d7d8..24c95a619e4c 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -553,18 +553,13 @@ static int mac80211_hwsim_config(struct ieee80211_hw *hw, u32 changed)
         struct mac80211_hwsim_data *data = hw->priv;
         struct ieee80211_conf *conf = &hw->conf;
 
-        printk(KERN_DEBUG "%s:%s (freq=%d radio_enabled=%d beacon_int=%d)\n",
+        printk(KERN_DEBUG "%s:%s (freq=%d radio_enabled=%d)\n",
                wiphy_name(hw->wiphy), __func__,
-               conf->channel->center_freq, conf->radio_enabled,
-               conf->beacon_int);
+               conf->channel->center_freq, conf->radio_enabled);
 
         data->channel = conf->channel;
         data->radio_enabled = conf->radio_enabled;
-        data->beacon_int = 1024 * conf->beacon_int / 1000 * HZ / 1000;
-        if (data->beacon_int < 1)
-                data->beacon_int = 1;
-
-        if (!data->started || !data->radio_enabled)
+        if (!data->started || !data->radio_enabled || !data->beacon_int)
                 del_timer(&data->beacon_timer);
         else
                 mod_timer(&data->beacon_timer, jiffies + data->beacon_int);
@@ -615,6 +610,7 @@ static void mac80211_hwsim_bss_info_changed(struct ieee80211_hw *hw,
                                             u32 changed)
 {
         struct hwsim_vif_priv *vp = (void *)vif->drv_priv;
+        struct mac80211_hwsim_data *data = hw->priv;
 
         hwsim_check_magic(vif);
 
@@ -628,6 +624,14 @@ static void mac80211_hwsim_bss_info_changed(struct ieee80211_hw *hw,
                 vp->aid = info->aid;
         }
 
+        if (changed & BSS_CHANGED_BEACON_INT) {
+                printk(KERN_DEBUG "  %s: BCNINT: %d\n",
+                       wiphy_name(hw->wiphy), info->beacon_int);
+                data->beacon_int = 1024 * info->beacon_int / 1000 * HZ / 1000;
+                if (WARN_ON(data->beacon_int))
+                        data->beacon_int = 1;
+        }
+
         if (changed & BSS_CHANGED_ERP_CTS_PROT) {
                 printk(KERN_DEBUG "  %s: ERP_CTS_PROT: %d\n",
                        wiphy_name(hw->wiphy), info->use_cts_prot);