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

Commit be49b1f1 authored Aug 19, 2016 by Jes Sorensen Committed by Kalle Valo Sep 03, 2016

rtl8xxxu: Simplify calculating of hw value used for setting TX rate



Calculating the value in one place rather than using one calculation
in one place and a different one for management frames in another
location makes little sense.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

parent eed145ab

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -4848,7 +4848,8 @@ static void rtl8xxxu_tx(struct ieee80211_hw *hw,
		}
		}

		if (rate_flag & IEEE80211_TX_RC_MCS)
		if (rate_flag & IEEE80211_TX_RC_MCS &&
		!ieee80211_is_mgmt(hdr->frame_control))
		rate = tx_info->control.rates[0].idx + DESC_RATE_MCS0;
		else
		rate = tx_rate->hw_value;
		@@ -4869,7 +4870,7 @@ static void rtl8xxxu_tx(struct ieee80211_hw *hw,
		tx_desc->txdw1 \|= cpu_to_le32(TXDESC32_AGG_BREAK);

		if (ieee80211_is_mgmt(hdr->frame_control)) {
		tx_desc->txdw5 = cpu_to_le32(tx_rate->hw_value);
		tx_desc->txdw5 = cpu_to_le32(rate);
		tx_desc->txdw4 \|=
		cpu_to_le32(TXDESC32_USE_DRIVER_RATE);
		tx_desc->txdw5 \|=
		@@ -4923,7 +4924,7 @@ static void rtl8xxxu_tx(struct ieee80211_hw *hw,
		tx_desc40->txdw2 \|= cpu_to_le32(TXDESC40_AGG_BREAK);

		if (ieee80211_is_mgmt(hdr->frame_control)) {
		tx_desc40->txdw4 = cpu_to_le32(tx_rate->hw_value);
		tx_desc40->txdw4 = cpu_to_le32(rate);
		tx_desc40->txdw3 \|=
		cpu_to_le32(TXDESC40_USE_DRIVER_RATE);
		tx_desc40->txdw4 \|=