aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-08-17 10:18:07 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-08-20 11:35:58 -0400
commitf424afa17899408cbd267a4c4534ca6fc9d8f71c (patch)
treeef68af16e693231b6842767ecd2ad04ba341cd93 /net/mac80211
parent3ac64beecd27400d12cc7afb4108eef26c499f6a (diff)
mac80211: remove deprecated API
All but two drivers have now stopped using the two deprecated members radio_enabled and beacon_int, so it's about time to remove them for good. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Acked-by: Kalle Valo <kalle.valo@iki.fi> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/main.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 05f923575fee..3302df96f8d4 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -241,9 +241,6 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,
241 241
242 drv_bss_info_changed(local, &sdata->vif, 242 drv_bss_info_changed(local, &sdata->vif,
243 &sdata->vif.bss_conf, changed); 243 &sdata->vif.bss_conf, changed);
244
245 /* DEPRECATED */
246 local->hw.conf.beacon_int = sdata->vif.bss_conf.beacon_int;
247} 244}
248 245
249u32 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata) 246u32 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata)
@@ -687,7 +684,6 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
687 local->hw.max_rates = 1; 684 local->hw.max_rates = 1;
688 local->hw.conf.long_frame_max_tx_count = wiphy->retry_long; 685 local->hw.conf.long_frame_max_tx_count = wiphy->retry_long;
689 local->hw.conf.short_frame_max_tx_count = wiphy->retry_short; 686 local->hw.conf.short_frame_max_tx_count = wiphy->retry_short;
690 local->hw.conf.radio_enabled = true;
691 local->user_power_level = -1; 687 local->user_power_level = -1;
692 688
693 INIT_LIST_HEAD(&local->interfaces); 689 INIT_LIST_HEAD(&local->interfaces);