mac80211: deprecate conf.beacon_int properly

Ivo has updated the driver to no longer use the change flag,
so we can remove that, but rt2x00 and ath5k still use the
actual value so let's mark it as deprecated too.

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

1 files changed, 2 insertions, 10 deletions

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index e37770ced53c..2683df918073 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -289,16 +289,8 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,
         drv_bss_info_changed(local, &sdata->vif,
                              &sdata->vif.bss_conf, changed);
 
-        /*
-         * DEPRECATED
-         *
-         * ~changed is just there to not do this at resume time
-         */
-        if (changed & BSS_CHANGED_BEACON_INT && ~changed) {
-                local->hw.conf.beacon_int = sdata->vif.bss_conf.beacon_int;
-                ieee80211_hw_config(local,
-                                    _IEEE80211_CONF_CHANGE_BEACON_INTERVAL);
-        }
+        /* DEPRECATED */
+        local->hw.conf.beacon_int = sdata->vif.bss_conf.beacon_int;
 }
 
 u32 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata)