Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mac80211: deprecate conf.beacon_int properly

Browse source 
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>
This commit is contained in:
Johannes Berg 2009-05-23 11:18:45 +02:00 committed by John W. Linville
parent 2fa7a98fc9
commit e535c7566e
2 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/net/mac80211.h
View file

@ -527,7 +527,6 @@ enum ieee80211_conf_flags {
* enum ieee80211_conf_changed - denotes which configuration changed * enum ieee80211_conf_changed - denotes which configuration changed
* *
* @IEEE80211_CONF_CHANGE_RADIO_ENABLED: the value of radio_enabled changed * @IEEE80211_CONF_CHANGE_RADIO_ENABLED: the value of radio_enabled changed
* @_IEEE80211_CONF_CHANGE_BEACON_INTERVAL: DEPRECATED
* @IEEE80211_CONF_CHANGE_LISTEN_INTERVAL: the listen interval changed * @IEEE80211_CONF_CHANGE_LISTEN_INTERVAL: the listen interval changed
* @IEEE80211_CONF_CHANGE_RADIOTAP: the radiotap flag changed * @IEEE80211_CONF_CHANGE_RADIOTAP: the radiotap flag changed
* @IEEE80211_CONF_CHANGE_PS: the PS flag or dynamic PS timeout changed * @IEEE80211_CONF_CHANGE_PS: the PS flag or dynamic PS timeout changed
@ -538,7 +537,6 @@ enum ieee80211_conf_flags {
*/ */
enum ieee80211_conf_changed { enum ieee80211_conf_changed {
IEEE80211_CONF_CHANGE_RADIO_ENABLED = BIT(0), IEEE80211_CONF_CHANGE_RADIO_ENABLED = BIT(0),
_IEEE80211_CONF_CHANGE_BEACON_INTERVAL = BIT(1),
IEEE80211_CONF_CHANGE_LISTEN_INTERVAL = BIT(2), IEEE80211_CONF_CHANGE_LISTEN_INTERVAL = BIT(2),
IEEE80211_CONF_CHANGE_RADIOTAP = BIT(3), IEEE80211_CONF_CHANGE_RADIOTAP = BIT(3),
IEEE80211_CONF_CHANGE_PS = BIT(4), IEEE80211_CONF_CHANGE_PS = BIT(4),
@ -548,14 +546,6 @@ enum ieee80211_conf_changed {
IEEE80211_CONF_CHANGE_IDLE = BIT(8), IEEE80211_CONF_CHANGE_IDLE = BIT(8),
}; };
static inline __deprecated enum ieee80211_conf_changed
__IEEE80211_CONF_CHANGE_BEACON_INTERVAL(void)
{
return _IEEE80211_CONF_CHANGE_BEACON_INTERVAL;
}
#define IEEE80211_CONF_CHANGE_BEACON_INTERVAL \
__IEEE80211_CONF_CHANGE_BEACON_INTERVAL()
/** /**
* struct ieee80211_conf - configuration of the device * struct ieee80211_conf - configuration of the device
* *
@ -564,7 +554,7 @@ __IEEE80211_CONF_CHANGE_BEACON_INTERVAL(void)
* @flags: configuration flags defined above * @flags: configuration flags defined above
* *
* @radio_enabled: when zero, driver is required to switch off the radio. * @radio_enabled: when zero, driver is required to switch off the radio.
* @beacon_int: beacon interval (TODO make interface config) * @beacon_int: DEPRECATED, DO NOT USE
* *
* @listen_interval: listen interval in units of beacon interval * @listen_interval: listen interval in units of beacon interval
* @max_sleep_period: the maximum number of beacon intervals to sleep for * @max_sleep_period: the maximum number of beacon intervals to sleep for
@ -589,7 +579,7 @@ __IEEE80211_CONF_CHANGE_BEACON_INTERVAL(void)
* number of transmissions not the number of retries * number of transmissions not the number of retries
*/ */
struct ieee80211_conf { struct ieee80211_conf {
int beacon_int; int __deprecated beacon_int;
u32 flags; u32 flags;
int power_level, dynamic_ps_timeout; int power_level, dynamic_ps_timeout;
int max_sleep_period; int max_sleep_period;

12
net/mac80211/main.c
View file

@ -289,16 +289,8 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,
drv_bss_info_changed(local, &sdata->vif, drv_bss_info_changed(local, &sdata->vif,
&sdata->vif.bss_conf, changed); &sdata->vif.bss_conf, changed);
/* /* DEPRECATED */
* DEPRECATED local->hw.conf.beacon_int = sdata->vif.bss_conf.beacon_int;
*
* ~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);
}
} }
u32 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata) u32 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata)