Skip to content

Commit e669bf0

Browse files
lwfingerintel-lab-lkp
lwfinger
authored and
intel-lab-lkp
committed
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 torvalds#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) torvalds#357: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c:2591: + (eeaddr+1), hwinfo[eeaddr+1]); ^ CHECK: spaces preferred around that '+' (ctx:VxV) torvalds#357: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c:2591: + (eeaddr+1), hwinfo[eeaddr+1]); ^ CHECK: spaces preferred around that '+' (ctx:VxV) torvalds#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 torvalds#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) torvalds#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: Larry Finger <[email protected]>
1 parent f7dcf2c commit e669bf0

File tree

7 files changed

+350
-350
lines changed

7 files changed

+350
-350
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@
9292
#define DM_REG_CCK_CCA_CNT_11N 0xA60
9393
#define DM_REG_BB_PWR_SAV4_11N 0xA74
9494
/*PAGE B */
95-
#define DM_REG_LNA_SWITCH_11N 0xB2C
96-
#define DM_REG_PATH_SWITCH_11N 0xB30
97-
#define DM_REG_RSSI_CTRL_11N 0xB38
98-
#define DM_REG_CONFIG_ANTA_11N 0xB68
99-
#define DM_REG_RSSI_BT_11N 0xB9C
95+
#define DM_REG_LNA_SWITCH_11N 0XB2C
96+
#define DM_REG_PATH_SWITCH_11N 0XB30
97+
#define DM_REG_RSSI_CTRL_11N 0XB38
98+
#define DM_REG_CONFIG_ANTA_11N 0XB68
99+
#define DM_REG_RSSI_BT_11N 0XB9C
100100
/*PAGE C */
101101
#define DM_REG_OFDM_FA_HOLDC_11N 0xC00
102102
#define DM_REG_RX_PATH_11N 0xC04

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

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -844,9 +844,9 @@ static u8 reserved_page_packet_8821[TOTAL_RESERVED_PKT_LEN_8821] = {
844844
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
845845
0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
846846
/* page 3: qos null data */
847-
0xC8, 0x01, 0x00, 0x00, 0x84, 0xC9, 0xB2, 0xA7,
848-
0xB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
849-
0x84, 0xC9, 0xB2, 0xA7, 0xB3, 0x6E, 0x00, 0x00,
847+
0xC8, 0x01, 0x00, 0x00, 0x84, 0xC9, 0XB2, 0xA7,
848+
0XB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
849+
0x84, 0xC9, 0XB2, 0xA7, 0XB3, 0x6E, 0x00, 0x00,
850850
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
851851
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
852852
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -877,9 +877,9 @@ static u8 reserved_page_packet_8821[TOTAL_RESERVED_PKT_LEN_8821] = {
877877
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
878878
0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
879879
/* page 4: BT qos null data */
880-
0xC8, 0x01, 0x00, 0x00, 0x84, 0xC9, 0xB2, 0xA7,
881-
0xB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
882-
0x84, 0xC9, 0xB2, 0xA7, 0xB3, 0x6E, 0x00, 0x00,
880+
0xC8, 0x01, 0x00, 0x00, 0x84, 0xC9, 0XB2, 0xA7,
881+
0XB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
882+
0x84, 0xC9, 0XB2, 0xA7, 0XB3, 0x6E, 0x00, 0x00,
883883
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
884884
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
885885
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -911,9 +911,9 @@ static u8 reserved_page_packet_8821[TOTAL_RESERVED_PKT_LEN_8821] = {
911911
0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
912912
/* page 5~7 is for wowlan */
913913
/* page 5: ARP resp */
914-
0x08, 0x01, 0x00, 0x00, 0x84, 0xC9, 0xB2, 0xA7,
915-
0xB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
916-
0x84, 0xC9, 0xB2, 0xA7, 0xB3, 0x6E, 0x00, 0x00,
914+
0x08, 0x01, 0x00, 0x00, 0x84, 0xC9, 0XB2, 0xA7,
915+
0XB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
916+
0x84, 0xC9, 0XB2, 0xA7, 0XB3, 0x6E, 0x00, 0x00,
917917
0xAA, 0xAA, 0x03, 0x00, 0x00, 0x00, 0x08, 0x06,
918918
0x00, 0x01, 0x08, 0x00, 0x06, 0x04, 0x00, 0x02,
919919
0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02, 0x00, 0x00,
@@ -1015,7 +1015,7 @@ static u8 reserved_page_packet_8812[TOTAL_RESERVED_PKT_LEN_8812] = {
10151015
/* page 0: beacon */
10161016
0x80, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
10171017
0xFF, 0xFF, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
1018-
0x84, 0xC9, 0xB2, 0xA7, 0xB3, 0x6E, 0x60, 0x00,
1018+
0x84, 0xC9, 0XB2, 0xA7, 0XB3, 0x6E, 0x60, 0x00,
10191019
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
10201020
0x64, 0x00, 0x20, 0x04, 0x00, 0x03, 0x32, 0x31,
10211021
0x35, 0x01, 0x08, 0x82, 0x84, 0x8B, 0x96, 0x0C,
@@ -1078,8 +1078,8 @@ static u8 reserved_page_packet_8812[TOTAL_RESERVED_PKT_LEN_8812] = {
10781078
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
10791079
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
10801080
/* page 1: ps-poll */
1081-
0xA4, 0x10, 0x09, 0xC0, 0x84, 0xC9, 0xB2, 0xA7,
1082-
0xB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
1081+
0xA4, 0x10, 0x09, 0xC0, 0x84, 0xC9, 0XB2, 0xA7,
1082+
0XB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
10831083
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
10841084
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
10851085
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1143,9 +1143,9 @@ static u8 reserved_page_packet_8812[TOTAL_RESERVED_PKT_LEN_8812] = {
11431143
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
11441144
0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
11451145
/* page 2: null data */
1146-
0x48, 0x01, 0x00, 0x00, 0x84, 0xC9, 0xB2, 0xA7,
1147-
0xB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
1148-
0x84, 0xC9, 0xB2, 0xA7, 0xB3, 0x6E, 0x00, 0x00,
1146+
0x48, 0x01, 0x00, 0x00, 0x84, 0xC9, 0XB2, 0xA7,
1147+
0XB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
1148+
0x84, 0xC9, 0XB2, 0xA7, 0XB3, 0x6E, 0x00, 0x00,
11491149
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
11501150
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
11511151
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1208,9 +1208,9 @@ static u8 reserved_page_packet_8812[TOTAL_RESERVED_PKT_LEN_8812] = {
12081208
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
12091209
0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
12101210
/* page 3: Qos null data */
1211-
0xC8, 0x01, 0x00, 0x00, 0x84, 0xC9, 0xB2, 0xA7,
1212-
0xB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
1213-
0x84, 0xC9, 0xB2, 0xA7, 0xB3, 0x6E, 0x00, 0x00,
1211+
0xC8, 0x01, 0x00, 0x00, 0x84, 0xC9, 0XB2, 0xA7,
1212+
0XB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
1213+
0x84, 0xC9, 0XB2, 0xA7, 0XB3, 0x6E, 0x00, 0x00,
12141214
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
12151215
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
12161216
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1273,9 +1273,9 @@ static u8 reserved_page_packet_8812[TOTAL_RESERVED_PKT_LEN_8812] = {
12731273
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
12741274
0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
12751275
/* page 4: BT Qos null data */
1276-
0xC8, 0x01, 0x00, 0x00, 0x84, 0xC9, 0xB2, 0xA7,
1277-
0xB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
1278-
0x84, 0xC9, 0xB2, 0xA7, 0xB3, 0x6E, 0x00, 0x00,
1276+
0xC8, 0x01, 0x00, 0x00, 0x84, 0xC9, 0XB2, 0xA7,
1277+
0XB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
1278+
0x84, 0xC9, 0XB2, 0xA7, 0XB3, 0x6E, 0x00, 0x00,
12791279
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
12801280
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
12811281
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1339,9 +1339,9 @@ static u8 reserved_page_packet_8812[TOTAL_RESERVED_PKT_LEN_8812] = {
13391339
0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
13401340
/* page 5~7 is for wowlan */
13411341
/* page 5: ARP resp */
1342-
0x08, 0x01, 0x00, 0x00, 0x84, 0xC9, 0xB2, 0xA7,
1343-
0xB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
1344-
0x84, 0xC9, 0xB2, 0xA7, 0xB3, 0x6E, 0x00, 0x00,
1342+
0x08, 0x01, 0x00, 0x00, 0x84, 0xC9, 0XB2, 0xA7,
1343+
0XB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
1344+
0x84, 0xC9, 0XB2, 0xA7, 0XB3, 0x6E, 0x00, 0x00,
13451345
0xAA, 0xAA, 0x03, 0x00, 0x00, 0x00, 0x08, 0x06,
13461346
0x00, 0x01, 0x08, 0x00, 0x06, 0x04, 0x00, 0x02,
13471347
0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02, 0x00, 0x00,
@@ -1543,8 +1543,8 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
15431543
struct sk_buff *skb = NULL;
15441544
u32 totalpacketlen;
15451545
bool rtstatus;
1546-
u8 u1RsvdPageLoc[5] = { 0 };
1547-
u8 u1RsvdPageLoc2[7] = { 0 };
1546+
u8 u1rsvdpageloc[5] = { 0 };
1547+
u8 u1rsvdpageloc2[7] = { 0 };
15481548
bool b_dlok = false;
15491549
u8 *beacon;
15501550
u8 *p_pspoll;
@@ -1574,7 +1574,7 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
15741574
SET_80211_PS_POLL_BSSID(p_pspoll, mac->bssid);
15751575
SET_80211_PS_POLL_TA(p_pspoll, mac->mac_addr);
15761576

1577-
SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1RsvdPageLoc, PSPOLL_PG);
1577+
SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1rsvdpageloc, PSPOLL_PG);
15781578

15791579
/*--------------------------------------------------------
15801580
* (3) null data
@@ -1585,7 +1585,7 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
15851585
SET_80211_HDR_ADDRESS2(nullfunc, mac->mac_addr);
15861586
SET_80211_HDR_ADDRESS3(nullfunc, mac->bssid);
15871587

1588-
SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(u1RsvdPageLoc, NULL_PG);
1588+
SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(u1rsvdpageloc, NULL_PG);
15891589

15901590
/*---------------------------------------------------------
15911591
* (4) Qos null data
@@ -1596,7 +1596,7 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
15961596
SET_80211_HDR_ADDRESS2(qosnull, mac->mac_addr);
15971597
SET_80211_HDR_ADDRESS3(qosnull, mac->bssid);
15981598

1599-
SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(u1RsvdPageLoc, QOSNULL_PG);
1599+
SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(u1rsvdpageloc, QOSNULL_PG);
16001600

16011601
/*---------------------------------------------------------
16021602
* (5) BT Qos null data
@@ -1607,7 +1607,7 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
16071607
SET_80211_HDR_ADDRESS2(btqosnull, mac->mac_addr);
16081608
SET_80211_HDR_ADDRESS3(btqosnull, mac->bssid);
16091609

1610-
SET_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(u1RsvdPageLoc, BT_QOSNULL_PG);
1610+
SET_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(u1rsvdpageloc, BT_QOSNULL_PG);
16111611

16121612
if (!dl_whole_packets) {
16131613
totalpacketlen = 512 * (BT_QOSNULL_PG + 1) - 40;
@@ -1622,20 +1622,20 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
16221622
SET_80211_HDR_ADDRESS2(arpresp, mac->mac_addr);
16231623
SET_80211_HDR_ADDRESS3(arpresp, mac->bssid);
16241624

1625-
SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_ARP_RSP(u1RsvdPageLoc2, ARPRESP_PG);
1625+
SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_ARP_RSP(u1rsvdpageloc2, ARPRESP_PG);
16261626

16271627
/*---------------------------------------------------------
16281628
* (7) Remote Wake Ctrl
16291629
*----------------------------------------------------------
16301630
*/
1631-
SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_REMOTE_WAKE_CTRL_INFO(u1RsvdPageLoc2,
1631+
SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_REMOTE_WAKE_CTRL_INFO(u1rsvdpageloc2,
16321632
REMOTE_PG);
16331633

16341634
/*---------------------------------------------------------
16351635
* (8) GTK Ext Memory
16361636
*----------------------------------------------------------
16371637
*/
1638-
SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(u1RsvdPageLoc2, GTKEXT_PG);
1638+
SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(u1rsvdpageloc2, GTKEXT_PG);
16391639

16401640
totalpacketlen = TOTAL_RESERVED_PKT_LEN_8812 - 40;
16411641

@@ -1654,14 +1654,14 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
16541654

16551655
if (!b_dl_finished && b_dlok) {
16561656
RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
1657-
"H2C_RSVDPAGE:\n", u1RsvdPageLoc, 5);
1657+
"H2C_RSVDPAGE:\n", u1rsvdpageloc, 5);
16581658
rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_RSVDPAGE,
1659-
sizeof(u1RsvdPageLoc), u1RsvdPageLoc);
1659+
sizeof(u1rsvdpageloc), u1rsvdpageloc);
16601660
if (dl_whole_packets) {
16611661
RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
1662-
"wowlan H2C_RSVDPAGE:\n", u1RsvdPageLoc2, 7);
1662+
"wowlan H2C_RSVDPAGE:\n", u1rsvdpageloc2, 7);
16631663
rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_AOAC_RSVDPAGE,
1664-
sizeof(u1RsvdPageLoc2), u1RsvdPageLoc2);
1664+
sizeof(u1rsvdpageloc2), u1rsvdpageloc2);
16651665
}
16661666
}
16671667

@@ -1678,8 +1678,8 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
16781678
struct sk_buff *skb = NULL;
16791679
u32 totalpacketlen;
16801680
bool rtstatus;
1681-
u8 u1RsvdPageLoc[5] = { 0 };
1682-
u8 u1RsvdPageLoc2[7] = { 0 };
1681+
u8 u1rsvdpageloc[5] = { 0 };
1682+
u8 u1rsvdpageloc2[7] = { 0 };
16831683
bool b_dlok = false;
16841684
u8 *beacon;
16851685
u8 *p_pspoll;
@@ -1709,7 +1709,7 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
17091709
SET_80211_PS_POLL_BSSID(p_pspoll, mac->bssid);
17101710
SET_80211_PS_POLL_TA(p_pspoll, mac->mac_addr);
17111711

1712-
SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1RsvdPageLoc, PSPOLL_PG);
1712+
SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1rsvdpageloc, PSPOLL_PG);
17131713

17141714
/*--------------------------------------------------------
17151715
* (3) null data
@@ -1720,7 +1720,7 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
17201720
SET_80211_HDR_ADDRESS2(nullfunc, mac->mac_addr);
17211721
SET_80211_HDR_ADDRESS3(nullfunc, mac->bssid);
17221722

1723-
SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(u1RsvdPageLoc, NULL_PG);
1723+
SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(u1rsvdpageloc, NULL_PG);
17241724

17251725
/*---------------------------------------------------------
17261726
* (4) Qos null data
@@ -1731,7 +1731,7 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
17311731
SET_80211_HDR_ADDRESS2(qosnull, mac->mac_addr);
17321732
SET_80211_HDR_ADDRESS3(qosnull, mac->bssid);
17331733

1734-
SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(u1RsvdPageLoc, QOSNULL_PG);
1734+
SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(u1rsvdpageloc, QOSNULL_PG);
17351735

17361736
/*---------------------------------------------------------
17371737
* (5) Qos null data
@@ -1742,7 +1742,7 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
17421742
SET_80211_HDR_ADDRESS2(btqosnull, mac->mac_addr);
17431743
SET_80211_HDR_ADDRESS3(btqosnull, mac->bssid);
17441744

1745-
SET_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(u1RsvdPageLoc, BT_QOSNULL_PG);
1745+
SET_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(u1rsvdpageloc, BT_QOSNULL_PG);
17461746

17471747
if (!dl_whole_packets) {
17481748
totalpacketlen = 256 * (BT_QOSNULL_PG + 1) - 40;
@@ -1757,20 +1757,20 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
17571757
SET_80211_HDR_ADDRESS2(arpresp, mac->mac_addr);
17581758
SET_80211_HDR_ADDRESS3(arpresp, mac->bssid);
17591759

1760-
SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_ARP_RSP(u1RsvdPageLoc2, ARPRESP_PG);
1760+
SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_ARP_RSP(u1rsvdpageloc2, ARPRESP_PG);
17611761

17621762
/*---------------------------------------------------------
17631763
* (7) Remote Wake Ctrl
17641764
*----------------------------------------------------------
17651765
*/
1766-
SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_REMOTE_WAKE_CTRL_INFO(u1RsvdPageLoc2,
1766+
SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_REMOTE_WAKE_CTRL_INFO(u1rsvdpageloc2,
17671767
REMOTE_PG);
17681768

17691769
/*---------------------------------------------------------
17701770
* (8) GTK Ext Memory
17711771
*----------------------------------------------------------
17721772
*/
1773-
SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(u1RsvdPageLoc2, GTKEXT_PG);
1773+
SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(u1rsvdpageloc2, GTKEXT_PG);
17741774

17751775
totalpacketlen = TOTAL_RESERVED_PKT_LEN_8821 - 40;
17761776

@@ -1792,16 +1792,16 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
17921792
RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
17931793
"Set RSVD page location to Fw.\n");
17941794
RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
1795-
"H2C_RSVDPAGE:\n", u1RsvdPageLoc, 5);
1795+
"H2C_RSVDPAGE:\n", u1rsvdpageloc, 5);
17961796
rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_RSVDPAGE,
1797-
sizeof(u1RsvdPageLoc), u1RsvdPageLoc);
1797+
sizeof(u1rsvdpageloc), u1rsvdpageloc);
17981798
if (dl_whole_packets) {
17991799
RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
18001800
"wowlan H2C_RSVDPAGE:\n",
1801-
u1RsvdPageLoc2, 7);
1801+
u1rsvdpageloc2, 7);
18021802
rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_AOAC_RSVDPAGE,
1803-
sizeof(u1RsvdPageLoc2),
1804-
u1RsvdPageLoc2);
1803+
sizeof(u1rsvdpageloc2),
1804+
u1rsvdpageloc2);
18051805
}
18061806
}
18071807

0 commit comments

Comments
 (0)