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: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c
index 106011a..2dd0169 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c
@@ -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);

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c
index 09cf818..49a4c84 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c
@@ -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);

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c
index 9ada9a0..a382cdc 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c
@@ -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);