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

rtlwifi: rtl8821ae: Remove CamelCase variables 



If a macro is in CamelCase, it it converted to upper case. Variables
and routine names are converted to lower case.

The following checkpatch exceptions are also fixed:

WARNING: line over 80 characters
#316: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c:1751:
+       SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(u1rsvdpageloc2, GTKEXT_PG);

CHECK: spaces preferred around that '+' (ctx:VxV)
#357: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c:2591:
+                (eeaddr+1), hwinfo[eeaddr+1]);
                        ^

CHECK: spaces preferred around that '+' (ctx:VxV)
#357: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c:2591:
+                (eeaddr+1), hwinfo[eeaddr+1]);
                                          ^

CHECK: spaces preferred around that '+' (ctx:VxV)
#358: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c:2592:
+       if (0xFF == hwinfo[eeaddr+1])  /*YJ,add,120316*/
                                 ^

WARNING: Comparisons should place the constant on the right side of the test
#358: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c:2592:
+       if (0xFF == hwinfo[eeaddr+1])  /*YJ,add,120316*/

CHECK: spaces preferred around that '&' (ctx:VxV)
#501: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c:2666:
+                               pwrinfo24g->bw40_diff[rfpath][txcount] = (hwinfo[eeaddr]&0xf0) >> 4;
                                                                                        ^
Note that not all checkpatch exceptions are addressed. Those will be
handled in later patches.

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

drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.h

+5 −5
Original line number Diff line number Diff line
@@ -70,11 +70,11 @@ 
#define	DM_REG_CCK_CCA_CNT_11N			0xA60

#define	DM_REG_BB_PWR_SAV4_11N			0xA74

/*PAGE B */

#define	DM_REG_LNA_SWITCH_11N			0xB2C

#define	DM_REG_PATH_SWITCH_11N			0xB30

#define	DM_REG_RSSI_CTRL_11N			0xB38

#define	DM_REG_CONFIG_ANTA_11N			0xB68

#define	DM_REG_RSSI_BT_11N				0xB9C

#define	DM_REG_LNA_SWITCH_11N			0XB2C

#define	DM_REG_PATH_SWITCH_11N			0XB30

#define	DM_REG_RSSI_CTRL_11N			0XB38

#define	DM_REG_CONFIG_ANTA_11N			0XB68

#define	DM_REG_RSSI_BT_11N				0XB9C

/*PAGE C */

#define	DM_REG_OFDM_FA_HOLDC_11N		0xC00

#define	DM_REG_RX_PATH_11N				0xC04

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

+51 −51
Original line number Diff line number Diff line
@@ -822,9 +822,9 @@ static u8 reserved_page_packet_8821[TOTAL_RESERVED_PKT_LEN_8821] = { 
	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	0x00, 0x80, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	/* page 3: qos null data */

	0xC8, 0x01, 0x00, 0x00,  0x84, 0xC9, 0xB2, 0xA7,

	0xB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,

	0x84, 0xC9, 0xB2, 0xA7,  0xB3, 0x6E, 0x00, 0x00,

	0xC8, 0x01, 0x00, 0x00,  0x84, 0xC9, 0XB2, 0xA7,

	0XB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,

	0x84, 0xC9, 0XB2, 0xA7,  0XB3, 0x6E, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
@@ -855,9 +855,9 @@ static u8 reserved_page_packet_8821[TOTAL_RESERVED_PKT_LEN_8821] = { 
	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	0x00, 0x80, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	/* page 4: BT qos null data */

	0xC8, 0x01, 0x00, 0x00,  0x84, 0xC9, 0xB2, 0xA7,

	0xB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,

	0x84, 0xC9, 0xB2, 0xA7,  0xB3, 0x6E, 0x00, 0x00,

	0xC8, 0x01, 0x00, 0x00,  0x84, 0xC9, 0XB2, 0xA7,

	0XB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,

	0x84, 0xC9, 0XB2, 0xA7,  0XB3, 0x6E, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
@@ -889,9 +889,9 @@ static u8 reserved_page_packet_8821[TOTAL_RESERVED_PKT_LEN_8821] = { 
	0x00, 0x80, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	/* page 5~7 is for wowlan */

	/* page 5: ARP resp */

	0x08, 0x01, 0x00, 0x00,  0x84, 0xC9, 0xB2, 0xA7,

	0xB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,

	0x84, 0xC9, 0xB2, 0xA7,  0xB3, 0x6E, 0x00, 0x00,

	0x08, 0x01, 0x00, 0x00,  0x84, 0xC9, 0XB2, 0xA7,

	0XB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,

	0x84, 0xC9, 0XB2, 0xA7,  0XB3, 0x6E, 0x00, 0x00,

	0xAA, 0xAA, 0x03, 0x00,  0x00, 0x00, 0x08, 0x06,

	0x00, 0x01, 0x08, 0x00,  0x06, 0x04, 0x00, 0x02,

	0x00, 0xE0, 0x4C, 0x02,  0x51, 0x02, 0x00, 0x00,
@@ -993,7 +993,7 @@ static u8 reserved_page_packet_8812[TOTAL_RESERVED_PKT_LEN_8812] = { 
	/* page 0: beacon */

	0x80, 0x00, 0x00, 0x00,  0xFF, 0xFF, 0xFF, 0xFF,

	0xFF, 0xFF, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,

	0x84, 0xC9, 0xB2, 0xA7,  0xB3, 0x6E, 0x60, 0x00,

	0x84, 0xC9, 0XB2, 0xA7,  0XB3, 0x6E, 0x60, 0x00,

	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	0x64, 0x00, 0x20, 0x04,  0x00, 0x03, 0x32, 0x31,

	0x35, 0x01, 0x08, 0x82,  0x84, 0x8B, 0x96, 0x0C,
@@ -1056,8 +1056,8 @@ static u8 reserved_page_packet_8812[TOTAL_RESERVED_PKT_LEN_8812] = { 
	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	/* page 1: ps-poll */

	0xA4, 0x10, 0x09, 0xC0,  0x84, 0xC9, 0xB2, 0xA7,

	0xB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,

	0xA4, 0x10, 0x09, 0xC0,  0x84, 0xC9, 0XB2, 0xA7,

	0XB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,

	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
@@ -1121,9 +1121,9 @@ static u8 reserved_page_packet_8812[TOTAL_RESERVED_PKT_LEN_8812] = { 
	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	0x00, 0x80, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	/* page 2: null data */

	0x48, 0x01, 0x00, 0x00,  0x84, 0xC9, 0xB2, 0xA7,

	0xB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,

	0x84, 0xC9, 0xB2, 0xA7,  0xB3, 0x6E, 0x00, 0x00,

	0x48, 0x01, 0x00, 0x00,  0x84, 0xC9, 0XB2, 0xA7,

	0XB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,

	0x84, 0xC9, 0XB2, 0xA7,  0XB3, 0x6E, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
@@ -1186,9 +1186,9 @@ static u8 reserved_page_packet_8812[TOTAL_RESERVED_PKT_LEN_8812] = { 
	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	0x00, 0x80, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	/* page 3: Qos null data */

	0xC8, 0x01, 0x00, 0x00,  0x84, 0xC9, 0xB2, 0xA7,

	0xB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,

	0x84, 0xC9, 0xB2, 0xA7,  0xB3, 0x6E, 0x00, 0x00,

	0xC8, 0x01, 0x00, 0x00,  0x84, 0xC9, 0XB2, 0xA7,

	0XB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,

	0x84, 0xC9, 0XB2, 0xA7,  0XB3, 0x6E, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
@@ -1251,9 +1251,9 @@ static u8 reserved_page_packet_8812[TOTAL_RESERVED_PKT_LEN_8812] = { 
	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	0x00, 0x80, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	/* page 4: BT Qos null data */

	0xC8, 0x01, 0x00, 0x00,  0x84, 0xC9, 0xB2, 0xA7,

	0xB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,

	0x84, 0xC9, 0xB2, 0xA7,  0xB3, 0x6E, 0x00, 0x00,

	0xC8, 0x01, 0x00, 0x00,  0x84, 0xC9, 0XB2, 0xA7,

	0XB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,

	0x84, 0xC9, 0XB2, 0xA7,  0XB3, 0x6E, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
@@ -1317,9 +1317,9 @@ static u8 reserved_page_packet_8812[TOTAL_RESERVED_PKT_LEN_8812] = { 
	0x00, 0x80, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,

	/* page 5~7 is for wowlan */

	/* page 5: ARP resp */

	0x08, 0x01, 0x00, 0x00,  0x84, 0xC9, 0xB2, 0xA7,

	0xB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,

	0x84, 0xC9, 0xB2, 0xA7,  0xB3, 0x6E, 0x00, 0x00,

	0x08, 0x01, 0x00, 0x00,  0x84, 0xC9, 0XB2, 0xA7,

	0XB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,

	0x84, 0xC9, 0XB2, 0xA7,  0XB3, 0x6E, 0x00, 0x00,

	0xAA, 0xAA, 0x03, 0x00,  0x00, 0x00, 0x08, 0x06,

	0x00, 0x01, 0x08, 0x00,  0x06, 0x04, 0x00, 0x02,

	0x00, 0xE0, 0x4C, 0x02,  0x51, 0x02, 0x00, 0x00,
@@ -1521,8 +1521,8 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, 
	struct sk_buff *skb = NULL;

	u32 totalpacketlen;

	bool rtstatus;

	u8 u1RsvdPageLoc[5] = { 0 };

	u8 u1RsvdPageLoc2[7] = { 0 };

	u8 u1rsvdpageloc[5] = { 0 };

	u8 u1rsvdpageloc2[7] = { 0 };

	bool b_dlok = false;

	u8 *beacon;

	u8 *p_pspoll;
@@ -1552,7 +1552,7 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, 
	SET_80211_PS_POLL_BSSID(p_pspoll, mac->bssid);

	SET_80211_PS_POLL_TA(p_pspoll, mac->mac_addr);



	SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1RsvdPageLoc, PSPOLL_PG);

	SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1rsvdpageloc, PSPOLL_PG);



	/*--------------------------------------------------------

	 *			(3) null data
@@ -1563,7 +1563,7 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, 
	SET_80211_HDR_ADDRESS2(nullfunc, mac->mac_addr);

	SET_80211_HDR_ADDRESS3(nullfunc, mac->bssid);



	SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(u1RsvdPageLoc, NULL_PG);

	SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(u1rsvdpageloc, NULL_PG);



	/*---------------------------------------------------------

	 *			(4) Qos null data
@@ -1574,7 +1574,7 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, 
	SET_80211_HDR_ADDRESS2(qosnull, mac->mac_addr);

	SET_80211_HDR_ADDRESS3(qosnull, mac->bssid);



	SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(u1RsvdPageLoc, QOSNULL_PG);

	SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(u1rsvdpageloc, QOSNULL_PG);



	/*---------------------------------------------------------

	 *			(5) BT Qos null data
@@ -1585,7 +1585,7 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, 
	SET_80211_HDR_ADDRESS2(btqosnull, mac->mac_addr);

	SET_80211_HDR_ADDRESS3(btqosnull, mac->bssid);



	SET_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(u1RsvdPageLoc, BT_QOSNULL_PG);

	SET_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(u1rsvdpageloc, BT_QOSNULL_PG);



	if (!dl_whole_packets) {

		totalpacketlen = 512 * (BT_QOSNULL_PG + 1) - 40;
@@ -1600,20 +1600,20 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, 
	SET_80211_HDR_ADDRESS2(arpresp, mac->mac_addr);

	SET_80211_HDR_ADDRESS3(arpresp, mac->bssid);



	SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_ARP_RSP(u1RsvdPageLoc2, ARPRESP_PG);

	SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_ARP_RSP(u1rsvdpageloc2, ARPRESP_PG);



	/*---------------------------------------------------------

	 *			(7) Remote Wake Ctrl

	 *----------------------------------------------------------

	 */

	SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_REMOTE_WAKE_CTRL_INFO(u1RsvdPageLoc2,

	SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_REMOTE_WAKE_CTRL_INFO(u1rsvdpageloc2,

								REMOTE_PG);



	/*---------------------------------------------------------

	 *			(8) GTK Ext Memory

	 *----------------------------------------------------------

	 */

	SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(u1RsvdPageLoc2, GTKEXT_PG);

	SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(u1rsvdpageloc2, GTKEXT_PG);



	totalpacketlen = TOTAL_RESERVED_PKT_LEN_8812 - 40;
@@ -1632,14 +1632,14 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, 


	if (!b_dl_finished && b_dlok) {

		RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,

			      "H2C_RSVDPAGE:\n", u1RsvdPageLoc, 5);

			      "H2C_RSVDPAGE:\n", u1rsvdpageloc, 5);

		rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_RSVDPAGE,

				       sizeof(u1RsvdPageLoc), u1RsvdPageLoc);

				       sizeof(u1rsvdpageloc), u1rsvdpageloc);

		if (dl_whole_packets) {

			RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,

				      "wowlan H2C_RSVDPAGE:\n", u1RsvdPageLoc2, 7);

				      "wowlan H2C_RSVDPAGE:\n", u1rsvdpageloc2, 7);

			rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_AOAC_RSVDPAGE,

					       sizeof(u1RsvdPageLoc2), u1RsvdPageLoc2);

					       sizeof(u1rsvdpageloc2), u1rsvdpageloc2);

		}

	}
@@ -1656,8 +1656,8 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, 
	struct sk_buff *skb = NULL;

	u32 totalpacketlen;

	bool rtstatus;

	u8 u1RsvdPageLoc[5] = { 0 };

	u8 u1RsvdPageLoc2[7] = { 0 };

	u8 u1rsvdpageloc[5] = { 0 };

	u8 u1rsvdpageloc2[7] = { 0 };

	bool b_dlok = false;

	u8 *beacon;

	u8 *p_pspoll;
@@ -1687,7 +1687,7 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, 
	SET_80211_PS_POLL_BSSID(p_pspoll, mac->bssid);

	SET_80211_PS_POLL_TA(p_pspoll, mac->mac_addr);



	SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1RsvdPageLoc, PSPOLL_PG);

	SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1rsvdpageloc, PSPOLL_PG);



	/*--------------------------------------------------------

	 *			(3) null data
@@ -1698,7 +1698,7 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, 
	SET_80211_HDR_ADDRESS2(nullfunc, mac->mac_addr);

	SET_80211_HDR_ADDRESS3(nullfunc, mac->bssid);



	SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(u1RsvdPageLoc, NULL_PG);

	SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(u1rsvdpageloc, NULL_PG);



	/*---------------------------------------------------------

	 *			(4) Qos null data
@@ -1709,7 +1709,7 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, 
	SET_80211_HDR_ADDRESS2(qosnull, mac->mac_addr);

	SET_80211_HDR_ADDRESS3(qosnull, mac->bssid);



	SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(u1RsvdPageLoc, QOSNULL_PG);

	SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(u1rsvdpageloc, QOSNULL_PG);



	/*---------------------------------------------------------

	 *			(5) Qos null data
@@ -1720,7 +1720,7 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, 
	SET_80211_HDR_ADDRESS2(btqosnull, mac->mac_addr);

	SET_80211_HDR_ADDRESS3(btqosnull, mac->bssid);



	SET_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(u1RsvdPageLoc, BT_QOSNULL_PG);

	SET_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(u1rsvdpageloc, BT_QOSNULL_PG);



	if (!dl_whole_packets) {

		totalpacketlen = 256 * (BT_QOSNULL_PG + 1) - 40;
@@ -1735,20 +1735,20 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, 
	SET_80211_HDR_ADDRESS2(arpresp, mac->mac_addr);

	SET_80211_HDR_ADDRESS3(arpresp, mac->bssid);



	SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_ARP_RSP(u1RsvdPageLoc2, ARPRESP_PG);

	SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_ARP_RSP(u1rsvdpageloc2, ARPRESP_PG);



	/*---------------------------------------------------------

	 *			(7) Remote Wake Ctrl

	 *----------------------------------------------------------

	 */

	SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_REMOTE_WAKE_CTRL_INFO(u1RsvdPageLoc2,

	SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_REMOTE_WAKE_CTRL_INFO(u1rsvdpageloc2,

									REMOTE_PG);



	/*---------------------------------------------------------

	 *			(8) GTK Ext Memory

	 *----------------------------------------------------------

	 */

	SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(u1RsvdPageLoc2, GTKEXT_PG);

	SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(u1rsvdpageloc2, GTKEXT_PG);



	totalpacketlen = TOTAL_RESERVED_PKT_LEN_8821 - 40;
@@ -1770,16 +1770,16 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, 
		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,

			 "Set RSVD page location to Fw.\n");

		RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,

				"H2C_RSVDPAGE:\n", u1RsvdPageLoc, 5);

				"H2C_RSVDPAGE:\n", u1rsvdpageloc, 5);

		rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_RSVDPAGE,

				       sizeof(u1RsvdPageLoc), u1RsvdPageLoc);

				       sizeof(u1rsvdpageloc), u1rsvdpageloc);

		if (dl_whole_packets) {

			RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,

				      "wowlan H2C_RSVDPAGE:\n",

				      u1RsvdPageLoc2, 7);

				      u1rsvdpageloc2, 7);

			rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_AOAC_RSVDPAGE,

					       sizeof(u1RsvdPageLoc2),

					       u1RsvdPageLoc2);

					       sizeof(u1rsvdpageloc2),

					       u1rsvdpageloc2);

		}

	}

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

+117 −117

File changed.

Preview size limit exceeded, changes collapsed.

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

+66 −66
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ u32 phy_get_tx_swing_8812A(struct ieee80211_hw *hw, u8 band, 
	const s8 auto_temp = -1;



	RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,

		 "===> PHY_GetTxBBSwing_8812A, bbSwing_2G: %d, bbSwing_5G: %d,autoload_failflag=%d.\n",

		 "===> PHY_GetTXBBSwing_8812A, bbSwing_2G: %d, bbSwing_5G: %d,autoload_failflag=%d.\n",

		 (int)swing_2g, (int)swing_5g,

		 (int)rtlefuse->autoload_failflag);
@@ -534,7 +534,7 @@ u32 phy_get_tx_swing_8812A(struct ieee80211_hw *hw, u8 band, 
		swing_a = (swing & 0x3) >> 0; /* 0xC6/C7[1:0] */

		swing_b = (swing & 0xC) >> 2; /* 0xC6/C7[3:2] */

		RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,

			 "===> PHY_GetTxBBSwing_8812A, swingA: 0x%X, swingB: 0x%X\n",

			 "===> PHY_GetTXBBSwing_8812A, swingA: 0x%X, swingB: 0x%X\n",

			 swing_a, swing_b);



		/* 3 Path-A */
@@ -592,7 +592,7 @@ u32 phy_get_tx_swing_8812A(struct ieee80211_hw *hw, u8 band, 
	}



	RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,

		 "<=== PHY_GetTxBBSwing_8812A, out = 0x%X\n", out);

		 "<=== PHY_GetTXBBSwing_8812A, out = 0x%X\n", out);

	return out;

}
@@ -1056,52 +1056,52 @@ static void _rtl8821ae_phy_store_txpower_by_rate_base(struct ieee80211_hw *hw) 
{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_phy *rtlphy = &rtlpriv->phy;

	u16 rawValue = 0;

	u16 rawvalue = 0;

	u8 base = 0, path = 0;



	for (path = RF90_PATH_A; path <= RF90_PATH_B; ++path) {

		rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_1TX][0] >> 24) & 0xFF;

		base = (rawValue >> 4) * 10 + (rawValue & 0xF);

		rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_1TX][0] >> 24) & 0xFF;

		base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);

		_rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_2_4G, path, CCK, RF_1TX, base);



		rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_1TX][2] >> 24) & 0xFF;

		base = (rawValue >> 4) * 10 + (rawValue & 0xF);

		rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_1TX][2] >> 24) & 0xFF;

		base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);

		_rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_2_4G, path, OFDM, RF_1TX, base);



		rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_1TX][4] >> 24) & 0xFF;

		base = (rawValue >> 4) * 10 + (rawValue & 0xF);

		rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_1TX][4] >> 24) & 0xFF;

		base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);

		_rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_2_4G, path, HT_MCS0_MCS7, RF_1TX, base);



		rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_2TX][6] >> 24) & 0xFF;

		base = (rawValue >> 4) * 10 + (rawValue & 0xF);

		rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_2TX][6] >> 24) & 0xFF;

		base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);

		_rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_2_4G, path, HT_MCS8_MCS15, RF_2TX, base);



		rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_1TX][8] >> 24) & 0xFF;

		base = (rawValue >> 4) * 10 + (rawValue & 0xF);

		rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_1TX][8] >> 24) & 0xFF;

		base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);

		_rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_2_4G, path, VHT_1SSMCS0_1SSMCS9, RF_1TX, base);



		rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_2TX][11] >> 8) & 0xFF;

		base = (rawValue >> 4) * 10 + (rawValue & 0xF);

		rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][path][RF_2TX][11] >> 8) & 0xFF;

		base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);

		_rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_2_4G, path, VHT_2SSMCS0_2SSMCS9, RF_2TX, base);



		rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_1TX][2] >> 24) & 0xFF;

		base = (rawValue >> 4) * 10 + (rawValue & 0xF);

		rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_1TX][2] >> 24) & 0xFF;

		base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);

		_rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_5G, path, OFDM, RF_1TX, base);



		rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_1TX][4] >> 24) & 0xFF;

		base = (rawValue >> 4) * 10 + (rawValue & 0xF);

		rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_1TX][4] >> 24) & 0xFF;

		base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);

		_rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_5G, path, HT_MCS0_MCS7, RF_1TX, base);



		rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_2TX][6] >> 24) & 0xFF;

		base = (rawValue >> 4) * 10 + (rawValue & 0xF);

		rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_2TX][6] >> 24) & 0xFF;

		base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);

		_rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_5G, path, HT_MCS8_MCS15, RF_2TX, base);



		rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_1TX][8] >> 24) & 0xFF;

		base = (rawValue >> 4) * 10 + (rawValue & 0xF);

		rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_1TX][8] >> 24) & 0xFF;

		base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);

		_rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_5G, path, VHT_1SSMCS0_1SSMCS9, RF_1TX, base);



		rawValue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_2TX][11] >> 8) & 0xFF;

		base = (rawValue >> 4) * 10 + (rawValue & 0xF);

		rawvalue = (u16)(rtlphy->tx_power_by_rate_offset[BAND_ON_5G][path][RF_2TX][11] >> 8) & 0xFF;

		base = (rawvalue >> 4) * 10 + (rawvalue & 0xF);

		_rtl8821ae_phy_set_txpower_by_rate_base(hw, BAND_ON_5G, path, VHT_2SSMCS0_2SSMCS9, RF_2TX, base);

	}

}
@@ -1358,7 +1358,7 @@ static void _rtl8812ae_phy_convert_txpower_limit_to_power_index(struct ieee80211 
						}



						RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,

							"TxPwrLimit_2_4G[regulation %d][bw %d][rateSection %d][channel %d] = %d\n(TxPwrLimit in dBm %d - BW40PwrLmt2_4G[channel %d][rfPath %d] %d)\n",

							"TxPwrLimit_2_4G[regulation %d][bw %d][rateSection %d][channel %d] = %d\n(TxPwrLimit in dBm %d - BW40PwrLmt2_4G[channel %d][rfpath %d] %d)\n",

							regulation, bw, rate_section, channel,

							rtlphy->txpwr_limit_2_4g[regulation][bw]

							[rate_section][channel][rf_path], (temp_pwrlmt == 63)
@@ -1423,7 +1423,7 @@ static void _rtl8812ae_phy_convert_txpower_limit_to_power_index(struct ieee80211 
						}



						RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,

							"TxPwrLimit_5G[regulation %d][bw %d][rateSection %d][channel %d] =%d\n(TxPwrLimit in dBm %d - BW40PwrLmt5G[chnl group %d][rfPath %d] %d)\n",

							"TxPwrLimit_5G[regulation %d][bw %d][rateSection %d][channel %d] =%d\n(TxPwrLimit in dBm %d - BW40PwrLmt5G[chnl group %d][rfpath %d] %d)\n",

							regulation, bw, rate_section,

							channel, rtlphy->txpwr_limit_5g[regulation]

							[bw][rate_section][channel][rf_path],
@@ -1473,106 +1473,106 @@ static void _rtl8821ae_phy_convert_txpower_dbm_to_relative_value(struct ieee8021 
{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_phy *rtlphy = &rtlpriv->phy;

	u8 base = 0, rfPath = 0;

	u8 base = 0, rfpath = 0;



	for (rfPath = RF90_PATH_A; rfPath <= RF90_PATH_B; ++rfPath) {

		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfPath, RF_1TX, CCK);

	for (rfpath = RF90_PATH_A; rfpath <= RF90_PATH_B; ++rfpath) {

		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfpath, RF_1TX, CCK);

		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][0],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][0],

			0, 3, base);



		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfPath, RF_1TX, OFDM);

		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfpath, RF_1TX, OFDM);

		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][1],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][1],

			0, 3, base);

		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][2],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][2],

			0, 3, base);



		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfPath, RF_1TX, HT_MCS0_MCS7);

		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfpath, RF_1TX, HT_MCS0_MCS7);

		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][3],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][3],

			0, 3, base);

		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][4],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][4],

			0, 3, base);



		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfPath, RF_2TX, HT_MCS8_MCS15);

		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfpath, RF_2TX, HT_MCS8_MCS15);



		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_2TX][5],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_2TX][5],

			0, 3, base);



		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_2TX][6],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_2TX][6],

			0, 3, base);



		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfPath, RF_1TX, VHT_1SSMCS0_1SSMCS9);

		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfpath, RF_1TX, VHT_1SSMCS0_1SSMCS9);

		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][7],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][7],

			0, 3, base);

		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][8],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][8],

			0, 3, base);

		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][9],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][9],

			0, 1, base);



		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfPath, RF_2TX, VHT_2SSMCS0_2SSMCS9);

		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_2_4G, rfpath, RF_2TX, VHT_2SSMCS0_2SSMCS9);

		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_1TX][9],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_1TX][9],

			2, 3, base);

		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_2TX][10],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_2TX][10],

			0, 3, base);

		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfPath][RF_2TX][11],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G][rfpath][RF_2TX][11],

			0, 3, base);



		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfPath, RF_1TX, OFDM);

		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfpath, RF_1TX, OFDM);

		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_1TX][1],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_1TX][1],

			0, 3, base);

		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_1TX][2],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_1TX][2],

			0, 3, base);



		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfPath, RF_1TX, HT_MCS0_MCS7);

		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfpath, RF_1TX, HT_MCS0_MCS7);

		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_1TX][3],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_1TX][3],

			0, 3, base);

		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_1TX][4],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_1TX][4],

			0, 3, base);



		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfPath, RF_2TX, HT_MCS8_MCS15);

		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfpath, RF_2TX, HT_MCS8_MCS15);

		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_2TX][5],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_2TX][5],

			0, 3, base);

		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_2TX][6],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_2TX][6],

			0, 3, base);



		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfPath, RF_1TX, VHT_1SSMCS0_1SSMCS9);

		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfpath, RF_1TX, VHT_1SSMCS0_1SSMCS9);

		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_1TX][7],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_1TX][7],

			0, 3, base);

		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_1TX][8],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_1TX][8],

			0, 3, base);

		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_1TX][9],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_1TX][9],

			0, 1, base);



		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfPath, RF_2TX, VHT_2SSMCS0_2SSMCS9);

		base = _rtl8821ae_phy_get_txpower_by_rate_base(hw, BAND_ON_5G, rfpath, RF_2TX, VHT_2SSMCS0_2SSMCS9);

		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_1TX][9],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_1TX][9],

			2, 3, base);

		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_2TX][10],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_2TX][10],

			0, 3, base);

		_phy_convert_txpower_dbm_to_relative_value(

			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfPath][RF_2TX][11],

			&rtlphy->tx_power_by_rate_offset[BAND_ON_5G][rfpath][RF_2TX][11],

			0, 3, base);

	}

drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.h

+2 −2
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ 


#define LOOP_LIMIT				5

#define MAX_STALL_TIME				50

#define AntennaDiversityValue			0x80

#define ANTENNADIVERSITYVALUE			0x80

#define MAX_TXPWR_IDX_NMODE_92S			63

#define Reset_Cnt_Limit				3

#define RESET_CNT_LIMIT				3



#define IQK_ADDA_REG_NUM			16

#define IQK_MAC_REG_NUM				4