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

Commit 4ee73f33 authored by Michal Kazior's avatar Michal Kazior Committed by John W. Linville
Browse files

mac80211: remove hw.conf.channel usage where possible 



Removes hw.conf.channel usage from the following functions:
 * ieee80211_mandatory_rates
 * ieee80211_sta_get_rates
 * ieee80211_frame_duration
 * ieee80211_rts_duration
 * ieee80211_ctstoself_duration

This is in preparation for multi-channel operation.

Signed-off-by: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f58cc809

drivers/net/wireless/ath/ath5k/ath5k.h

+1 −1
Original line number Diff line number Diff line
@@ -1527,7 +1527,7 @@ void ath5k_eeprom_detach(struct ath5k_hw *ah); 


/* Protocol Control Unit Functions */

/* Helpers */

int ath5k_hw_get_frame_duration(struct ath5k_hw *ah,

int ath5k_hw_get_frame_duration(struct ath5k_hw *ah, enum ieee80211_band band,

		int len, struct ieee80211_rate *rate, bool shortpre);

unsigned int ath5k_hw_get_default_slottime(struct ath5k_hw *ah);

unsigned int ath5k_hw_get_default_sifs(struct ath5k_hw *ah);

drivers/net/wireless/ath/ath5k/pcu.c

+5 −4
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static const unsigned int ack_rates_high[] = 
 * bwmodes.

 */

int

ath5k_hw_get_frame_duration(struct ath5k_hw *ah,

ath5k_hw_get_frame_duration(struct ath5k_hw *ah, enum ieee80211_band band,

		int len, struct ieee80211_rate *rate, bool shortpre)

{

	int sifs, preamble, plcp_bits, sym_time;
@@ -120,7 +120,7 @@ ath5k_hw_get_frame_duration(struct ath5k_hw *ah, 
	/* Fallback */

	if (!ah->ah_bwmode) {

		__le16 raw_dur = ieee80211_generic_frame_duration(ah->hw,

					NULL, len, rate);

					NULL, band, len, rate);



		/* subtract difference between long and short preamble */

		dur = le16_to_cpu(raw_dur);
@@ -302,14 +302,15 @@ ath5k_hw_write_rate_duration(struct ath5k_hw *ah) 
		 * actual rate for this rate. See mac80211 tx.c

		 * ieee80211_duration() for a brief description of

		 * what rate we should choose to TX ACKs. */

		tx_time = ath5k_hw_get_frame_duration(ah, 10, rate, false);

		tx_time = ath5k_hw_get_frame_duration(ah, band, 10,

					rate, false);



		ath5k_hw_reg_write(ah, tx_time, reg);



		if (!(rate->flags & IEEE80211_RATE_SHORT_PREAMBLE))

			continue;



		tx_time = ath5k_hw_get_frame_duration(ah, 10, rate, true);

		tx_time = ath5k_hw_get_frame_duration(ah, band, 10, rate, true);

		ath5k_hw_reg_write(ah, tx_time,

			reg + (AR5K_SET_SHORT_PREAMBLE << 2));

	}

drivers/net/wireless/ath/ath5k/qcu.c

+5 −3
Original line number Diff line number Diff line
@@ -565,6 +565,7 @@ ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue) 
int ath5k_hw_set_ifs_intervals(struct ath5k_hw *ah, unsigned int slot_time)

{

	struct ieee80211_channel *channel = ah->ah_current_channel;

	enum ieee80211_band band;

	struct ieee80211_rate *rate;

	u32 ack_tx_time, eifs, eifs_clock, sifs, sifs_clock;

	u32 slot_time_clock = ath5k_hw_htoclock(ah, slot_time);
@@ -600,11 +601,12 @@ int ath5k_hw_set_ifs_intervals(struct ath5k_hw *ah, unsigned int slot_time) 
	 * Also we have different lowest rate for 802.11a

	 */

	if (channel->band == IEEE80211_BAND_5GHZ)

		rate = &ah->sbands[IEEE80211_BAND_5GHZ].bitrates[0];

		band = IEEE80211_BAND_5GHZ;

	else

		rate = &ah->sbands[IEEE80211_BAND_2GHZ].bitrates[0];

		band = IEEE80211_BAND_2GHZ;



	ack_tx_time = ath5k_hw_get_frame_duration(ah, 10, rate, false);

	rate = &ah->sbands[band].bitrates[0];

	ack_tx_time = ath5k_hw_get_frame_duration(ah, band, 10, rate, false);



	/* ack_tx_time includes an SIFS already */

	eifs = ack_tx_time + sifs + 2 * slot_time;

drivers/net/wireless/b43/xmit.c

+2 −1
Original line number Diff line number Diff line
@@ -290,7 +290,8 @@ int b43_generate_txhdr(struct b43_wldev *dev, 
		txhdr->dur_fb = wlhdr->duration_id;

	} else {

		txhdr->dur_fb = ieee80211_generic_frame_duration(

			dev->wl->hw, info->control.vif, fragment_len, fbrate);

			dev->wl->hw, info->control.vif, info->band,

			fragment_len, fbrate);

	}



	plcp_fragment_len = fragment_len + FCS_LEN;

drivers/net/wireless/b43legacy/main.c

+2 −0
Original line number Diff line number Diff line
@@ -1056,6 +1056,7 @@ static void b43legacy_write_probe_resp_plcp(struct b43legacy_wldev *dev, 
	b43legacy_generate_plcp_hdr(&plcp, size + FCS_LEN, rate->hw_value);

	dur = ieee80211_generic_frame_duration(dev->wl->hw,

					       dev->wl->vif,

					       IEEE80211_BAND_2GHZ,

					       size,

					       rate);

	/* Write PLCP in two parts and timing for packet transfer */
@@ -1121,6 +1122,7 @@ static const u8 *b43legacy_generate_probe_resp(struct b43legacy_wldev *dev, 
					 IEEE80211_STYPE_PROBE_RESP);

	dur = ieee80211_generic_frame_duration(dev->wl->hw,

					       dev->wl->vif,

					       IEEE80211_BAND_2GHZ,

					       *dest_size,

					       rate);

	hdr->duration_id = dur;