Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f424afa1 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

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: default avatarJohannes Berg <johannes@sipsolutions.net>
Acked-by: default avatarKalle Valo <kalle.valo@iki.fi>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3ac64bee

drivers/net/wireless/at76c50x-usb.c

+2 −3
Original line number Diff line number Diff line
@@ -1950,9 +1950,8 @@ static int at76_config(struct ieee80211_hw *hw, u32 changed) 
{

	struct at76_priv *priv = hw->priv;



	at76_dbg(DBG_MAC80211, "%s(): channel %d radio %d",

		 __func__, hw->conf.channel->hw_value,

		 hw->conf.radio_enabled);

	at76_dbg(DBG_MAC80211, "%s(): channel %d",

		 __func__, hw->conf.channel->hw_value);

	at76_dbg_dump(DBG_MAC80211, priv->bssid, ETH_ALEN, "bssid:");



	mutex_lock(&priv->mtx);

drivers/net/wireless/mwl8k.c

+0 −7
Original line number Diff line number Diff line
@@ -3031,13 +3031,6 @@ static int mwl8k_config_wt(struct work_struct *wt) 
	struct mwl8k_priv *priv = hw->priv;

	int rc = 0;



	if (!conf->radio_enabled) {

		mwl8k_cmd_802_11_radio_control(hw, MWL8K_RADIO_DISABLE);

		priv->current_channel = NULL;

		rc = 0;

		goto mwl8k_config_exit;

	}



	if (mwl8k_cmd_802_11_radio_control(hw, MWL8K_RADIO_ENABLE)) {

		rc = -EINVAL;

		goto mwl8k_config_exit;

include/net/mac80211.h

+0 −15
Original line number Diff line number Diff line
@@ -583,7 +583,6 @@ enum ieee80211_conf_flags { 
/**

 * enum ieee80211_conf_changed - denotes which configuration changed

 *

 * @_IEEE80211_CONF_CHANGE_RADIO_ENABLED: DEPRECATED

 * @IEEE80211_CONF_CHANGE_LISTEN_INTERVAL: the listen interval changed

 * @IEEE80211_CONF_CHANGE_RADIOTAP: the radiotap flag changed

 * @IEEE80211_CONF_CHANGE_PS: the PS flag or dynamic PS timeout changed
@@ -593,7 +592,6 @@ enum ieee80211_conf_flags { 
 * @IEEE80211_CONF_CHANGE_IDLE: Idle flag changed

 */

enum ieee80211_conf_changed {

	_IEEE80211_CONF_CHANGE_RADIO_ENABLED	= BIT(0),

	IEEE80211_CONF_CHANGE_LISTEN_INTERVAL	= BIT(2),

	IEEE80211_CONF_CHANGE_RADIOTAP		= BIT(3),

	IEEE80211_CONF_CHANGE_PS		= BIT(4),
@@ -603,14 +601,6 @@ enum ieee80211_conf_changed { 
	IEEE80211_CONF_CHANGE_IDLE		= BIT(8),

};



static inline __deprecated enum ieee80211_conf_changed

__IEEE80211_CONF_CHANGE_RADIO_ENABLED(void)

{

	return _IEEE80211_CONF_CHANGE_RADIO_ENABLED;

}

#define IEEE80211_CONF_CHANGE_RADIO_ENABLED \

	__IEEE80211_CONF_CHANGE_RADIO_ENABLED()



/**

 * struct ieee80211_conf - configuration of the device

 *
@@ -618,9 +608,6 @@ __IEEE80211_CONF_CHANGE_RADIO_ENABLED(void) 
 *

 * @flags: configuration flags defined above

 *

 * @radio_enabled: when zero, driver is required to switch off the radio.

 * @beacon_int: DEPRECATED, DO NOT USE

 *

 * @listen_interval: listen interval in units of beacon interval

 * @max_sleep_period: the maximum number of beacon intervals to sleep for

 *	before checking the beacon for a TIM bit (managed mode only); this
@@ -644,13 +631,11 @@ __IEEE80211_CONF_CHANGE_RADIO_ENABLED(void) 
 *    number of transmissions not the number of retries

 */

struct ieee80211_conf {

	int __deprecated beacon_int;

	u32 flags;

	int power_level, dynamic_ps_timeout;

	int max_sleep_period;



	u16 listen_interval;

	bool __deprecated radio_enabled;



	u8 long_frame_max_tx_count, short_frame_max_tx_count;

net/mac80211/main.c

+0 −4
Original line number Diff line number Diff line
@@ -241,9 +241,6 @@ 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 */

	local->hw.conf.beacon_int = sdata->vif.bss_conf.beacon_int;

}



u32 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, 
	local->hw.max_rates = 1;

	local->hw.conf.long_frame_max_tx_count = wiphy->retry_long;

	local->hw.conf.short_frame_max_tx_count = wiphy->retry_short;

	local->hw.conf.radio_enabled = true;

	local->user_power_level = -1;



	INIT_LIST_HEAD(&local->interfaces);