Commit 8a566afe authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Remove usage of IEEE80211_CONF_CHANGE_BEACON_INTERVAL 



IEEE80211_CONF_CHANGE_BEACON_INTERVAL was deprecated a month ago,
it is about time to remove all usage from the rt2x00 drivers and
use the correct beacon interval configuration through the bss_info
structure.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3b91c360

drivers/net/wireless/rt2x00/rt2400pci.c

+8 −22
Original line number Diff line number Diff line
@@ -335,10 +335,11 @@ static void rt2400pci_config_erp(struct rt2x00_dev *rt2x00dev, 
	preamble_mask = erp->short_preamble << 3;



	rt2x00pci_register_read(rt2x00dev, TXCSR1, &reg);

	rt2x00_set_field32(&reg, TXCSR1_ACK_TIMEOUT,

			   erp->ack_timeout);

	rt2x00_set_field32(&reg, TXCSR1_ACK_TIMEOUT, erp->ack_timeout);

	rt2x00_set_field32(&reg, TXCSR1_ACK_CONSUME_TIME,

			   erp->ack_consume_time);

	rt2x00_set_field32(&reg, TXCSR1_TSF_OFFSET, IEEE80211_HEADER);

	rt2x00_set_field32(&reg, TXCSR1_AUTORESPONDER, 1);

	rt2x00pci_register_write(rt2x00dev, TXCSR1, reg);



	rt2x00pci_register_read(rt2x00dev, ARCSR2, &reg);
@@ -371,6 +372,11 @@ static void rt2400pci_config_erp(struct rt2x00_dev *rt2x00dev, 
	rt2x00_set_field32(&reg, CSR11_SLOT_TIME, erp->slot_time);

	rt2x00pci_register_write(rt2x00dev, CSR11, reg);



	rt2x00pci_register_read(rt2x00dev, CSR12, &reg);

	rt2x00_set_field32(&reg, CSR12_BEACON_INTERVAL, erp->beacon_int * 16);

	rt2x00_set_field32(&reg, CSR12_CFP_MAX_DURATION, erp->beacon_int * 16);

	rt2x00pci_register_write(rt2x00dev, CSR12, reg);



	rt2x00pci_register_read(rt2x00dev, CSR18, &reg);

	rt2x00_set_field32(&reg, CSR18_SIFS, erp->sifs);

	rt2x00_set_field32(&reg, CSR18_PIFS, erp->pifs);
@@ -503,24 +509,6 @@ static void rt2400pci_config_retry_limit(struct rt2x00_dev *rt2x00dev, 
	rt2x00pci_register_write(rt2x00dev, CSR11, reg);

}



static void rt2400pci_config_duration(struct rt2x00_dev *rt2x00dev,

				      struct rt2x00lib_conf *libconf)

{

	u32 reg;



	rt2x00pci_register_read(rt2x00dev, TXCSR1, &reg);

	rt2x00_set_field32(&reg, TXCSR1_TSF_OFFSET, IEEE80211_HEADER);

	rt2x00_set_field32(&reg, TXCSR1_AUTORESPONDER, 1);

	rt2x00pci_register_write(rt2x00dev, TXCSR1, reg);



	rt2x00pci_register_read(rt2x00dev, CSR12, &reg);

	rt2x00_set_field32(&reg, CSR12_BEACON_INTERVAL,

			   libconf->conf->beacon_int * 16);

	rt2x00_set_field32(&reg, CSR12_CFP_MAX_DURATION,

			   libconf->conf->beacon_int * 16);

	rt2x00pci_register_write(rt2x00dev, CSR12, reg);

}



static void rt2400pci_config_ps(struct rt2x00_dev *rt2x00dev,

				struct rt2x00lib_conf *libconf)

{
@@ -558,8 +546,6 @@ static void rt2400pci_config(struct rt2x00_dev *rt2x00dev, 
					 libconf->conf->power_level);

	if (flags & IEEE80211_CONF_CHANGE_RETRY_LIMITS)

		rt2400pci_config_retry_limit(rt2x00dev, libconf);

	if (flags & IEEE80211_CONF_CHANGE_BEACON_INTERVAL)

		rt2400pci_config_duration(rt2x00dev, libconf);

	if (flags & IEEE80211_CONF_CHANGE_PS)

		rt2400pci_config_ps(rt2x00dev, libconf);

}

drivers/net/wireless/rt2x00/rt2500pci.c

+8 −22
Original line number Diff line number Diff line
@@ -341,10 +341,11 @@ static void rt2500pci_config_erp(struct rt2x00_dev *rt2x00dev, 
	preamble_mask = erp->short_preamble << 3;



	rt2x00pci_register_read(rt2x00dev, TXCSR1, &reg);

	rt2x00_set_field32(&reg, TXCSR1_ACK_TIMEOUT,

			   erp->ack_timeout);

	rt2x00_set_field32(&reg, TXCSR1_ACK_TIMEOUT, erp->ack_timeout);

	rt2x00_set_field32(&reg, TXCSR1_ACK_CONSUME_TIME,

			   erp->ack_consume_time);

	rt2x00_set_field32(&reg, TXCSR1_TSF_OFFSET, IEEE80211_HEADER);

	rt2x00_set_field32(&reg, TXCSR1_AUTORESPONDER, 1);

	rt2x00pci_register_write(rt2x00dev, TXCSR1, reg);



	rt2x00pci_register_read(rt2x00dev, ARCSR2, &reg);
@@ -377,6 +378,11 @@ static void rt2500pci_config_erp(struct rt2x00_dev *rt2x00dev, 
	rt2x00_set_field32(&reg, CSR11_SLOT_TIME, erp->slot_time);

	rt2x00pci_register_write(rt2x00dev, CSR11, reg);



	rt2x00pci_register_read(rt2x00dev, CSR12, &reg);

	rt2x00_set_field32(&reg, CSR12_BEACON_INTERVAL, erp->beacon_int * 16);

	rt2x00_set_field32(&reg, CSR12_CFP_MAX_DURATION, erp->beacon_int * 16);

	rt2x00pci_register_write(rt2x00dev, CSR12, reg);



	rt2x00pci_register_read(rt2x00dev, CSR18, &reg);

	rt2x00_set_field32(&reg, CSR18_SIFS, erp->sifs);

	rt2x00_set_field32(&reg, CSR18_PIFS, erp->pifs);
@@ -552,24 +558,6 @@ static void rt2500pci_config_retry_limit(struct rt2x00_dev *rt2x00dev, 
	rt2x00pci_register_write(rt2x00dev, CSR11, reg);

}



static void rt2500pci_config_duration(struct rt2x00_dev *rt2x00dev,

				      struct rt2x00lib_conf *libconf)

{

	u32 reg;



	rt2x00pci_register_read(rt2x00dev, TXCSR1, &reg);

	rt2x00_set_field32(&reg, TXCSR1_TSF_OFFSET, IEEE80211_HEADER);

	rt2x00_set_field32(&reg, TXCSR1_AUTORESPONDER, 1);

	rt2x00pci_register_write(rt2x00dev, TXCSR1, reg);



	rt2x00pci_register_read(rt2x00dev, CSR12, &reg);

	rt2x00_set_field32(&reg, CSR12_BEACON_INTERVAL,

			   libconf->conf->beacon_int * 16);

	rt2x00_set_field32(&reg, CSR12_CFP_MAX_DURATION,

			   libconf->conf->beacon_int * 16);

	rt2x00pci_register_write(rt2x00dev, CSR12, reg);

}



static void rt2500pci_config_ps(struct rt2x00_dev *rt2x00dev,

				struct rt2x00lib_conf *libconf)

{
@@ -609,8 +597,6 @@ static void rt2500pci_config(struct rt2x00_dev *rt2x00dev, 
					 libconf->conf->power_level);

	if (flags & IEEE80211_CONF_CHANGE_RETRY_LIMITS)

		rt2500pci_config_retry_limit(rt2x00dev, libconf);

	if (flags & IEEE80211_CONF_CHANGE_BEACON_INTERVAL)

		rt2500pci_config_duration(rt2x00dev, libconf);

	if (flags & IEEE80211_CONF_CHANGE_PS)

		rt2500pci_config_ps(rt2x00dev, libconf);

}

drivers/net/wireless/rt2x00/rt2500usb.c

+4 −13
Original line number Diff line number Diff line
@@ -503,6 +503,10 @@ static void rt2500usb_config_erp(struct rt2x00_dev *rt2x00dev, 


	rt2500usb_register_write(rt2x00dev, TXRX_CSR11, erp->basic_rates);



	rt2500usb_register_read(rt2x00dev, TXRX_CSR18, &reg);

	rt2x00_set_field16(&reg, TXRX_CSR18_INTERVAL, erp->beacon_int * 4);

	rt2500usb_register_write(rt2x00dev, TXRX_CSR18, reg);



	rt2500usb_register_write(rt2x00dev, MAC_CSR10, erp->slot_time);

	rt2500usb_register_write(rt2x00dev, MAC_CSR11, erp->sifs);

	rt2500usb_register_write(rt2x00dev, MAC_CSR12, erp->eifs);
@@ -632,17 +636,6 @@ static void rt2500usb_config_txpower(struct rt2x00_dev *rt2x00dev, 
	rt2500usb_rf_write(rt2x00dev, 3, rf3);

}



static void rt2500usb_config_duration(struct rt2x00_dev *rt2x00dev,

				      struct rt2x00lib_conf *libconf)

{

	u16 reg;



	rt2500usb_register_read(rt2x00dev, TXRX_CSR18, &reg);

	rt2x00_set_field16(&reg, TXRX_CSR18_INTERVAL,

			   libconf->conf->beacon_int * 4);

	rt2500usb_register_write(rt2x00dev, TXRX_CSR18, reg);

}



static void rt2500usb_config_ps(struct rt2x00_dev *rt2x00dev,

				struct rt2x00lib_conf *libconf)

{
@@ -680,8 +673,6 @@ static void rt2500usb_config(struct rt2x00_dev *rt2x00dev, 
	    !(flags & IEEE80211_CONF_CHANGE_CHANNEL))

		rt2500usb_config_txpower(rt2x00dev,

					 libconf->conf->power_level);

	if (flags & IEEE80211_CONF_CHANGE_BEACON_INTERVAL)

		rt2500usb_config_duration(rt2x00dev, libconf);

	if (flags & IEEE80211_CONF_CHANGE_PS)

		rt2500usb_config_ps(rt2x00dev, libconf);

}

drivers/net/wireless/rt2x00/rt2800usb.c

+5 −13
Original line number Diff line number Diff line
@@ -616,6 +616,11 @@ static void rt2800usb_config_erp(struct rt2x00_dev *rt2x00dev, 
	rt2x00_set_field32(&reg, XIFS_TIME_CFG_EIFS, erp->eifs);

	rt2x00_set_field32(&reg, XIFS_TIME_CFG_BB_RXEND_ENABLE, 1);

	rt2x00usb_register_write(rt2x00dev, XIFS_TIME_CFG, reg);



	rt2x00usb_register_read(rt2x00dev, BCN_TIME_CFG, &reg);

	rt2x00_set_field32(&reg, BCN_TIME_CFG_BEACON_INTERVAL,

			   erp->beacon_int * 16);

	rt2x00usb_register_write(rt2x00dev, BCN_TIME_CFG, reg);

}



static void rt2800usb_config_ant(struct rt2x00_dev *rt2x00dev,
@@ -955,17 +960,6 @@ static void rt2800usb_config_retry_limit(struct rt2x00_dev *rt2x00dev, 
	rt2x00usb_register_write(rt2x00dev, TX_RTY_CFG, reg);

}



static void rt2800usb_config_duration(struct rt2x00_dev *rt2x00dev,

				      struct rt2x00lib_conf *libconf)

{

	u32 reg;



	rt2x00usb_register_read(rt2x00dev, BCN_TIME_CFG, &reg);

	rt2x00_set_field32(&reg, BCN_TIME_CFG_BEACON_INTERVAL,

			   libconf->conf->beacon_int * 16);

	rt2x00usb_register_write(rt2x00dev, BCN_TIME_CFG, reg);

}



static void rt2800usb_config_ps(struct rt2x00_dev *rt2x00dev,

				struct rt2x00lib_conf *libconf)

{
@@ -1010,8 +1004,6 @@ static void rt2800usb_config(struct rt2x00_dev *rt2x00dev, 
		rt2800usb_config_txpower(rt2x00dev, libconf->conf->power_level);

	if (flags & IEEE80211_CONF_CHANGE_RETRY_LIMITS)

		rt2800usb_config_retry_limit(rt2x00dev, libconf);

	if (flags & IEEE80211_CONF_CHANGE_BEACON_INTERVAL)

		rt2800usb_config_duration(rt2x00dev, libconf);

	if (flags & IEEE80211_CONF_CHANGE_PS)

		rt2800usb_config_ps(rt2x00dev, libconf);

}

drivers/net/wireless/rt2x00/rt2x00.h

+2 −0
Original line number Diff line number Diff line
@@ -417,6 +417,8 @@ struct rt2x00lib_erp { 
	short pifs;

	short difs;

	short eifs;



	u16 beacon_int;

};



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE