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

Commit 0961d987 authored by Larry Finger's avatar Larry Finger Committed by Kalle Valo
Browse files

rtlwifi: Fix duplicate tests of one of the RX descriptors 



In drivers rtl8188ee, rtl8821ae, rtl8723be, and rtl8192ee, the reason
for a wake-up is returned in the fourth RX descriptor in bits 29-31. Due
to typographical errors, all but rtl8821ae test bit 31 twice and fail to
test bit 29.

This error causes no problems as the tests are only used to set bits in
the output of an optional debugging statement.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent a927e8d8

drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c

+1 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw, 
	status->is_cck = RTL8188_RX_HAL_IS_CCK_RATE(status->rate);



	status->macid = GET_RX_DESC_MACID(pdesc);

	if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))

	if (GET_RX_STATUS_DESC_PATTERN_MATCH(pdesc))

		status->wake_match = BIT(2);

	else if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))

		status->wake_match = BIT(1);

drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ bool rtl92ee_rx_query_desc(struct ieee80211_hw *hw, 
	status->is_cck = RTL92EE_RX_HAL_IS_CCK_RATE(status->rate);



	status->macid = GET_RX_DESC_MACID(pdesc);

	if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))

	if (GET_RX_STATUS_DESC_PATTERN_MATCH(pdesc))

		status->wake_match = BIT(2);

	else if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))

		status->wake_match = BIT(1);

drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ bool rtl8723be_rx_query_desc(struct ieee80211_hw *hw, 
		status->packet_report_type = NORMAL_RX;





	if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))

	if (GET_RX_STATUS_DESC_PATTERN_MATCH(pdesc))

		status->wake_match = BIT(2);

	else if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))

		status->wake_match = BIT(1);