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

mac80211: make retry limits part of hw config 



Instead of having a separate callback, use the HW config callback
with a new flag to change retry limits.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 52518189

drivers/net/wireless/ath9k/main.c

+0 −1
Original line number Diff line number Diff line
@@ -1659,7 +1659,6 @@ static struct ieee80211_ops ath9k_ops = { 
	.get_tkip_seq       = NULL,

	.set_rts_threshold  = NULL,

	.set_frag_threshold = NULL,

	.set_retry_limit    = NULL,

	.get_tsf 	    = ath9k_get_tsf,

	.reset_tsf 	    = ath9k_reset_tsf,

	.tx_last_beacon     = NULL,

drivers/net/wireless/b43/main.c

+23 −37
Original line number Diff line number Diff line
@@ -3320,6 +3320,22 @@ static int b43_switch_band(struct b43_wl *wl, struct ieee80211_channel *chan) 
	return err;

}



/* Write the short and long frame retry limit values. */

static void b43_set_retry_limits(struct b43_wldev *dev,

				 unsigned int short_retry,

				 unsigned int long_retry)

{

	/* The retry limit is a 4-bit counter. Enforce this to avoid overflowing

	 * the chip-internal counter. */

	short_retry = min(short_retry, (unsigned int)0xF);

	long_retry = min(long_retry, (unsigned int)0xF);



	b43_shm_write16(dev, B43_SHM_SCRATCH, B43_SHM_SC_SRLIMIT,

			short_retry);

	b43_shm_write16(dev, B43_SHM_SCRATCH, B43_SHM_SC_LRLIMIT,

			long_retry);

}



static int b43_op_config(struct ieee80211_hw *hw, u32 changed)

{

	struct b43_wl *wl = hw_to_b43_wl(hw);
@@ -3340,6 +3356,13 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed) 
	dev = wl->current_dev;

	phy = &dev->phy;



	if (changed & IEEE80211_CONF_CHANGE_RETRY_LIMITS)

		b43_set_retry_limits(dev, conf->short_frame_max_tx_count,

					  conf->long_frame_max_tx_count);

	changed &= ~IEEE80211_CONF_CHANGE_RETRY_LIMITS;

	if (!changed)

		goto out_unlock_mutex;



	/* Disable IRQs while reconfiguring the device.

	 * This makes it possible to drop the spinlock throughout

	 * the reconfiguration process. */
@@ -3859,22 +3882,6 @@ static void b43_imcfglo_timeouts_workaround(struct b43_wldev *dev) 
#endif /* CONFIG_SSB_DRIVER_PCICORE */

}



/* Write the short and long frame retry limit values. */

static void b43_set_retry_limits(struct b43_wldev *dev,

				 unsigned int short_retry,

				 unsigned int long_retry)

{

	/* The retry limit is a 4-bit counter. Enforce this to avoid overflowing

	 * the chip-internal counter. */

	short_retry = min(short_retry, (unsigned int)0xF);

	long_retry = min(long_retry, (unsigned int)0xF);



	b43_shm_write16(dev, B43_SHM_SCRATCH, B43_SHM_SC_SRLIMIT,

			short_retry);

	b43_shm_write16(dev, B43_SHM_SCRATCH, B43_SHM_SC_LRLIMIT,

			long_retry);

}



static void b43_set_synth_pu_delay(struct b43_wldev *dev, bool idle)

{

	u16 pu_delay;
@@ -4195,26 +4202,6 @@ static void b43_op_stop(struct ieee80211_hw *hw) 
	cancel_work_sync(&(wl->txpower_adjust_work));

}



static int b43_op_set_retry_limit(struct ieee80211_hw *hw,

				  u32 short_retry_limit, u32 long_retry_limit)

{

	struct b43_wl *wl = hw_to_b43_wl(hw);

	struct b43_wldev *dev;

	int err = 0;



	mutex_lock(&wl->mutex);

	dev = wl->current_dev;

	if (unlikely(!dev || (b43_status(dev) < B43_STAT_INITIALIZED))) {

		err = -ENODEV;

		goto out_unlock;

	}

	b43_set_retry_limits(dev, short_retry_limit, long_retry_limit);

out_unlock:

	mutex_unlock(&wl->mutex);



	return err;

}



static int b43_op_beacon_set_tim(struct ieee80211_hw *hw,

				 struct ieee80211_sta *sta, bool set)

{
@@ -4251,7 +4238,6 @@ static const struct ieee80211_ops b43_hw_ops = { 
	.get_tx_stats		= b43_op_get_tx_stats,

	.start			= b43_op_start,

	.stop			= b43_op_stop,

	.set_retry_limit	= b43_op_set_retry_limit,

	.set_tim		= b43_op_beacon_set_tim,

	.sta_notify		= b43_op_sta_notify,

};

drivers/net/wireless/b43legacy/main.c

+22 −37
Original line number Diff line number Diff line
@@ -2556,6 +2556,20 @@ static int b43legacy_switch_phymode(struct b43legacy_wl *wl, 
	return err;

}



/* Write the short and long frame retry limit values. */

static void b43legacy_set_retry_limits(struct b43legacy_wldev *dev,

				       unsigned int short_retry,

				       unsigned int long_retry)

{

	/* The retry limit is a 4-bit counter. Enforce this to avoid overflowing

	 * the chip-internal counter. */

	short_retry = min(short_retry, (unsigned int)0xF);

	long_retry = min(long_retry, (unsigned int)0xF);



	b43legacy_shm_write16(dev, B43legacy_SHM_WIRELESS, 0x0006, short_retry);

	b43legacy_shm_write16(dev, B43legacy_SHM_WIRELESS, 0x0007, long_retry);

}



static int b43legacy_op_dev_config(struct ieee80211_hw *hw,

				   u32 changed)

{
@@ -2577,6 +2591,14 @@ static int b43legacy_op_dev_config(struct ieee80211_hw *hw, 
	dev = wl->current_dev;

	phy = &dev->phy;



	if (changed & IEEE80211_CONF_CHANGE_RETRY_LIMITS)

		b43legacy_set_retry_limits(dev,

					   conf->short_frame_max_tx_count,

					   conf->long_frame_max_tx_count);

	changed &= ~IEEE80211_CONF_CHANGE_RETRY_LIMITS;

	if (!changed)

		goto out_unlock_mutex;



	/* Switch the PHY mode (if necessary). */

	switch (conf->channel->band) {

	case IEEE80211_BAND_2GHZ:
@@ -2989,20 +3011,6 @@ static void b43legacy_imcfglo_timeouts_workaround(struct b43legacy_wldev *dev) 
#endif /* CONFIG_SSB_DRIVER_PCICORE */

}



/* Write the short and long frame retry limit values. */

static void b43legacy_set_retry_limits(struct b43legacy_wldev *dev,

				       unsigned int short_retry,

				       unsigned int long_retry)

{

	/* The retry limit is a 4-bit counter. Enforce this to avoid overflowing

	 * the chip-internal counter. */

	short_retry = min(short_retry, (unsigned int)0xF);

	long_retry = min(long_retry, (unsigned int)0xF);



	b43legacy_shm_write16(dev, B43legacy_SHM_WIRELESS, 0x0006, short_retry);

	b43legacy_shm_write16(dev, B43legacy_SHM_WIRELESS, 0x0007, long_retry);

}



static void b43legacy_set_synth_pu_delay(struct b43legacy_wldev *dev,

					  bool idle) {

	u16 pu_delay = 1050;
@@ -3367,28 +3375,6 @@ static void b43legacy_op_stop(struct ieee80211_hw *hw) 
	mutex_unlock(&wl->mutex);

}



static int b43legacy_op_set_retry_limit(struct ieee80211_hw *hw,

					u32 short_retry_limit,

					u32 long_retry_limit)

{

	struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);

	struct b43legacy_wldev *dev;

	int err = 0;



	mutex_lock(&wl->mutex);

	dev = wl->current_dev;

	if (unlikely(!dev ||

		     (b43legacy_status(dev) < B43legacy_STAT_INITIALIZED))) {

		err = -ENODEV;

		goto out_unlock;

	}

	b43legacy_set_retry_limits(dev, short_retry_limit, long_retry_limit);

out_unlock:

	mutex_unlock(&wl->mutex);



	return err;

}



static int b43legacy_op_beacon_set_tim(struct ieee80211_hw *hw,

				       struct ieee80211_sta *sta, bool set)

{
@@ -3414,7 +3400,6 @@ static const struct ieee80211_ops b43legacy_hw_ops = { 
	.get_tx_stats		= b43legacy_op_get_tx_stats,

	.start			= b43legacy_op_start,

	.stop			= b43legacy_op_stop,

	.set_retry_limit	= b43legacy_op_set_retry_limit,

	.set_tim		= b43legacy_op_beacon_set_tim,

};

drivers/net/wireless/rt2x00/rt2400pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1574,7 +1574,6 @@ static const struct ieee80211_ops rt2400pci_mac80211_ops = { 
	.config_interface	= rt2x00mac_config_interface,

	.configure_filter	= rt2x00mac_configure_filter,

	.get_stats		= rt2x00mac_get_stats,

	.set_retry_limit	= rt2400pci_set_retry_limit,

	.bss_info_changed	= rt2x00mac_bss_info_changed,

	.conf_tx		= rt2400pci_conf_tx,

	.get_tx_stats		= rt2x00mac_get_tx_stats,
@@ -1603,6 +1602,7 @@ static const struct rt2x00lib_ops rt2400pci_rt2x00_ops = { 
	.config_intf		= rt2400pci_config_intf,

	.config_erp		= rt2400pci_config_erp,

	.config			= rt2400pci_config,

	.set_retry_limit	= rt2400pci_set_retry_limit,

};



static const struct data_queue_desc rt2400pci_queue_rx = {

drivers/net/wireless/rt2x00/rt2500pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1874,7 +1874,6 @@ static const struct ieee80211_ops rt2500pci_mac80211_ops = { 
	.config_interface	= rt2x00mac_config_interface,

	.configure_filter	= rt2x00mac_configure_filter,

	.get_stats		= rt2x00mac_get_stats,

	.set_retry_limit	= rt2500pci_set_retry_limit,

	.bss_info_changed	= rt2x00mac_bss_info_changed,

	.conf_tx		= rt2x00mac_conf_tx,

	.get_tx_stats		= rt2x00mac_get_tx_stats,
@@ -1903,6 +1902,7 @@ static const struct rt2x00lib_ops rt2500pci_rt2x00_ops = { 
	.config_intf		= rt2500pci_config_intf,

	.config_erp		= rt2500pci_config_erp,

	.config			= rt2500pci_config,

	.set_retry_limit	= rt2500pci_set_retry_limit,

};



static const struct data_queue_desc rt2500pci_queue_rx = {