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

rtlwifi: Convert the wake_match variable to local 



In five of the drivers, the contents of bits 29-31 of one of the RX
descriptors is used to set bits in a variable that is used to save the
wakeup condition for output in a debugging statement. The resulting
variable is not used anywhere else even though it is stored in a struct
and could be available in other routines. This variable is changed to be
local.

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

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

+8 −7
Original line number Diff line number Diff line
@@ -372,8 +372,9 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw, 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rx_fwinfo_88e *p_drvinfo;

	struct ieee80211_hdr *hdr;



	u8 wake_match;

	u32 phystatus = GET_RX_DESC_PHYST(pdesc);



	status->packet_report_type = (u8)GET_RX_STATUS_DESC_RPT_SEL(pdesc);

	if (status->packet_report_type == TX_REPORT2)

		status->length = (u16)GET_RX_RPT2_DESC_PKT_LEN(pdesc);
@@ -400,17 +401,17 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw, 


	status->macid = GET_RX_DESC_MACID(pdesc);

	if (GET_RX_STATUS_DESC_PATTERN_MATCH(pdesc))

		status->wake_match = BIT(2);

		wake_match = BIT(2);

	else if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))

		status->wake_match = BIT(1);

		wake_match = BIT(1);

	else if (GET_RX_STATUS_DESC_UNICAST_MATCH(pdesc))

		status->wake_match = BIT(0);

		wake_match = BIT(0);

	else

		status->wake_match = 0;

	if (status->wake_match)

		wake_match = 0;

	if (wake_match)

		RT_TRACE(rtlpriv, COMP_RXDESC, DBG_LOUD,

		"GGGGGGGGGGGGGet Wakeup Packet!! WakeMatch=%d\n",

		status->wake_match);

		wake_match);

	rx_status->freq = hw->conf.chandef.chan->center_freq;

	rx_status->band = hw->conf.chandef.chan->band;

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

0 → 100644
+10 −0
Original line number Diff line number Diff line 
--- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c

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

@@ -373,6 +373,7 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw,

 	struct rx_fwinfo_88e *p_drvinfo;

 	struct ieee80211_hdr *hdr;

 	u32 phystatus = GET_RX_DESC_PHYST(pdesc);

+	u8 wake_match;

 

 	status->packet_report_type = (u8)GET_RX_STATUS_DESC_RPT_SEL(pdesc);

 	if (status->packet_report_type == TX_REPORT2)

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

+7 −6
Original line number Diff line number Diff line
@@ -331,6 +331,7 @@ bool rtl92ee_rx_query_desc(struct ieee80211_hw *hw, 
	struct rx_fwinfo *p_drvinfo;

	struct ieee80211_hdr *hdr;

	u32 phystatus = GET_RX_DESC_PHYST(pdesc);

	u8 wake_match;



	if (GET_RX_STATUS_DESC_RPT_SEL(pdesc) == 0)

		status->packet_report_type = NORMAL_RX;
@@ -351,17 +352,17 @@ bool rtl92ee_rx_query_desc(struct ieee80211_hw *hw, 


	status->macid = GET_RX_DESC_MACID(pdesc);

	if (GET_RX_STATUS_DESC_PATTERN_MATCH(pdesc))

		status->wake_match = BIT(2);

		wake_match = BIT(2);

	else if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))

		status->wake_match = BIT(1);

		wake_match = BIT(1);

	else if (GET_RX_STATUS_DESC_UNICAST_MATCH(pdesc))

		status->wake_match = BIT(0);

		wake_match = BIT(0);

	else

		status->wake_match = 0;

	if (status->wake_match)

		wake_match = 0;

	if (wake_match)

		RT_TRACE(rtlpriv, COMP_RXDESC, DBG_LOUD,

			 "GGGGGGGGGGGGGet Wakeup Packet!! WakeMatch=%d\n",

			 status->wake_match);

			 wake_match);

	rx_status->freq = hw->conf.chandef.chan->center_freq;

	rx_status->band = hw->conf.chandef.chan->band;

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

+7 −7
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ bool rtl8723be_rx_query_desc(struct ieee80211_hw *hw, 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rx_fwinfo_8723be *p_drvinfo;

	struct ieee80211_hdr *hdr;



	u8 wake_match;

	u32 phystatus = GET_RX_DESC_PHYST(pdesc);



	status->length = (u16)GET_RX_DESC_PKT_LEN(pdesc);
@@ -330,17 +330,17 @@ bool rtl8723be_rx_query_desc(struct ieee80211_hw *hw, 




	if (GET_RX_STATUS_DESC_PATTERN_MATCH(pdesc))

		status->wake_match = BIT(2);

		wake_match = BIT(2);

	else if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))

		status->wake_match = BIT(1);

		wake_match = BIT(1);

	else if (GET_RX_STATUS_DESC_UNICAST_MATCH(pdesc))

		status->wake_match = BIT(0);

		wake_match = BIT(0);

	else

		status->wake_match = 0;

	if (status->wake_match)

		wake_match = 0;

	if (wake_match)

		RT_TRACE(rtlpriv, COMP_RXDESC, DBG_LOUD,

		"GGGGGGGGGGGGGet Wakeup Packet!! WakeMatch=%d\n",

		status->wake_match);

		wake_match);

	rx_status->freq = hw->conf.chandef.chan->center_freq;

	rx_status->band = hw->conf.chandef.chan->band;

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

+7 −7
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ bool rtl8821ae_rx_query_desc(struct ieee80211_hw *hw, 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rx_fwinfo_8821ae *p_drvinfo;

	struct ieee80211_hdr *hdr;



	u8 wake_match;

	u32 phystatus = GET_RX_DESC_PHYST(pdesc);



	status->length = (u16)GET_RX_DESC_PKT_LEN(pdesc);
@@ -473,18 +473,18 @@ bool rtl8821ae_rx_query_desc(struct ieee80211_hw *hw, 
		status->packet_report_type = NORMAL_RX;



	if (GET_RX_STATUS_DESC_PATTERN_MATCH(pdesc))

		status->wake_match = BIT(2);

		wake_match = BIT(2);

	else if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))

		status->wake_match = BIT(1);

		wake_match = BIT(1);

	else if (GET_RX_STATUS_DESC_UNICAST_MATCH(pdesc))

		status->wake_match = BIT(0);

		wake_match = BIT(0);

	else

		status->wake_match = 0;

		wake_match = 0;



	if (status->wake_match)

	if (wake_match)

		RT_TRACE(rtlpriv, COMP_RXDESC, DBG_LOUD,

			 "GGGGGGGGGGGGGet Wakeup Packet!! WakeMatch=%d\n",

			 status->wake_match);

			 wake_match);

	rx_status->freq = hw->conf.chandef.chan->center_freq;

	rx_status->band = hw->conf.chandef.chan->band;

CRA Git | Maintained and supported by SUSTech CRA and CCSE