Skip to content

Commit 9c66a7e

Browse files
lwfingerKalle Valo
lwfinger
authored and
Kalle Valo
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]> Signed-off-by: Kalle Valo <[email protected]>
1 parent 92a1aa2 commit 9c66a7e

File tree

7 files changed

+350
-350
lines changed

7 files changed

+350
-350
lines changed

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@
7070
#define DM_REG_CCK_CCA_CNT_11N 0xA60
7171
#define DM_REG_BB_PWR_SAV4_11N 0xA74
7272
/*PAGE B */
73-
#define DM_REG_LNA_SWITCH_11N 0xB2C
74-
#define DM_REG_PATH_SWITCH_11N 0xB30
75-
#define DM_REG_RSSI_CTRL_11N 0xB38
76-
#define DM_REG_CONFIG_ANTA_11N 0xB68
77-
#define DM_REG_RSSI_BT_11N 0xB9C
73+
#define DM_REG_LNA_SWITCH_11N 0XB2C
74+
#define DM_REG_PATH_SWITCH_11N 0XB30
75+
#define DM_REG_RSSI_CTRL_11N 0XB38
76+
#define DM_REG_CONFIG_ANTA_11N 0XB68
77+
#define DM_REG_RSSI_BT_11N 0XB9C
7878
/*PAGE C */
7979
#define DM_REG_OFDM_FA_HOLDC_11N 0xC00
8080
#define DM_REG_RX_PATH_11N 0xC04

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

+51-51
Original file line numberDiff line numberDiff line change
@@ -822,9 +822,9 @@ static u8 reserved_page_packet_8821[TOTAL_RESERVED_PKT_LEN_8821] = {
822822
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
823823
0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
824824
/* page 3: qos null data */
825-
0xC8, 0x01, 0x00, 0x00, 0x84, 0xC9, 0xB2, 0xA7,
826-
0xB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
827-
0x84, 0xC9, 0xB2, 0xA7, 0xB3, 0x6E, 0x00, 0x00,
825+
0xC8, 0x01, 0x00, 0x00, 0x84, 0xC9, 0XB2, 0xA7,
826+
0XB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
827+
0x84, 0xC9, 0XB2, 0xA7, 0XB3, 0x6E, 0x00, 0x00,
828828
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
829829
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
830830
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -855,9 +855,9 @@ static u8 reserved_page_packet_8821[TOTAL_RESERVED_PKT_LEN_8821] = {
855855
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
856856
0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
857857
/* page 4: BT qos null data */
858-
0xC8, 0x01, 0x00, 0x00, 0x84, 0xC9, 0xB2, 0xA7,
859-
0xB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
860-
0x84, 0xC9, 0xB2, 0xA7, 0xB3, 0x6E, 0x00, 0x00,
858+
0xC8, 0x01, 0x00, 0x00, 0x84, 0xC9, 0XB2, 0xA7,
859+
0XB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
860+
0x84, 0xC9, 0XB2, 0xA7, 0XB3, 0x6E, 0x00, 0x00,
861861
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
862862
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
863863
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -889,9 +889,9 @@ static u8 reserved_page_packet_8821[TOTAL_RESERVED_PKT_LEN_8821] = {
889889
0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
890890
/* page 5~7 is for wowlan */
891891
/* page 5: ARP resp */
892-
0x08, 0x01, 0x00, 0x00, 0x84, 0xC9, 0xB2, 0xA7,
893-
0xB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
894-
0x84, 0xC9, 0xB2, 0xA7, 0xB3, 0x6E, 0x00, 0x00,
892+
0x08, 0x01, 0x00, 0x00, 0x84, 0xC9, 0XB2, 0xA7,
893+
0XB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
894+
0x84, 0xC9, 0XB2, 0xA7, 0XB3, 0x6E, 0x00, 0x00,
895895
0xAA, 0xAA, 0x03, 0x00, 0x00, 0x00, 0x08, 0x06,
896896
0x00, 0x01, 0x08, 0x00, 0x06, 0x04, 0x00, 0x02,
897897
0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02, 0x00, 0x00,
@@ -993,7 +993,7 @@ static u8 reserved_page_packet_8812[TOTAL_RESERVED_PKT_LEN_8812] = {
993993
/* page 0: beacon */
994994
0x80, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
995995
0xFF, 0xFF, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
996-
0x84, 0xC9, 0xB2, 0xA7, 0xB3, 0x6E, 0x60, 0x00,
996+
0x84, 0xC9, 0XB2, 0xA7, 0XB3, 0x6E, 0x60, 0x00,
997997
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
998998
0x64, 0x00, 0x20, 0x04, 0x00, 0x03, 0x32, 0x31,
999999
0x35, 0x01, 0x08, 0x82, 0x84, 0x8B, 0x96, 0x0C,
@@ -1056,8 +1056,8 @@ static u8 reserved_page_packet_8812[TOTAL_RESERVED_PKT_LEN_8812] = {
10561056
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
10571057
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
10581058
/* page 1: ps-poll */
1059-
0xA4, 0x10, 0x09, 0xC0, 0x84, 0xC9, 0xB2, 0xA7,
1060-
0xB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
1059+
0xA4, 0x10, 0x09, 0xC0, 0x84, 0xC9, 0XB2, 0xA7,
1060+
0XB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
10611061
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
10621062
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
10631063
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1121,9 +1121,9 @@ static u8 reserved_page_packet_8812[TOTAL_RESERVED_PKT_LEN_8812] = {
11211121
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
11221122
0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
11231123
/* page 2: null data */
1124-
0x48, 0x01, 0x00, 0x00, 0x84, 0xC9, 0xB2, 0xA7,
1125-
0xB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
1126-
0x84, 0xC9, 0xB2, 0xA7, 0xB3, 0x6E, 0x00, 0x00,
1124+
0x48, 0x01, 0x00, 0x00, 0x84, 0xC9, 0XB2, 0xA7,
1125+
0XB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
1126+
0x84, 0xC9, 0XB2, 0xA7, 0XB3, 0x6E, 0x00, 0x00,
11271127
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
11281128
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
11291129
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1186,9 +1186,9 @@ static u8 reserved_page_packet_8812[TOTAL_RESERVED_PKT_LEN_8812] = {
11861186
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
11871187
0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
11881188
/* page 3: Qos null data */
1189-
0xC8, 0x01, 0x00, 0x00, 0x84, 0xC9, 0xB2, 0xA7,
1190-
0xB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
1191-
0x84, 0xC9, 0xB2, 0xA7, 0xB3, 0x6E, 0x00, 0x00,
1189+
0xC8, 0x01, 0x00, 0x00, 0x84, 0xC9, 0XB2, 0xA7,
1190+
0XB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
1191+
0x84, 0xC9, 0XB2, 0xA7, 0XB3, 0x6E, 0x00, 0x00,
11921192
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
11931193
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
11941194
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1251,9 +1251,9 @@ static u8 reserved_page_packet_8812[TOTAL_RESERVED_PKT_LEN_8812] = {
12511251
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
12521252
0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
12531253
/* page 4: BT Qos null data */
1254-
0xC8, 0x01, 0x00, 0x00, 0x84, 0xC9, 0xB2, 0xA7,
1255-
0xB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
1256-
0x84, 0xC9, 0xB2, 0xA7, 0xB3, 0x6E, 0x00, 0x00,
1254+
0xC8, 0x01, 0x00, 0x00, 0x84, 0xC9, 0XB2, 0xA7,
1255+
0XB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
1256+
0x84, 0xC9, 0XB2, 0xA7, 0XB3, 0x6E, 0x00, 0x00,
12571257
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
12581258
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
12591259
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1317,9 +1317,9 @@ static u8 reserved_page_packet_8812[TOTAL_RESERVED_PKT_LEN_8812] = {
13171317
0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
13181318
/* page 5~7 is for wowlan */
13191319
/* page 5: ARP resp */
1320-
0x08, 0x01, 0x00, 0x00, 0x84, 0xC9, 0xB2, 0xA7,
1321-
0xB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
1322-
0x84, 0xC9, 0xB2, 0xA7, 0xB3, 0x6E, 0x00, 0x00,
1320+
0x08, 0x01, 0x00, 0x00, 0x84, 0xC9, 0XB2, 0xA7,
1321+
0XB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,
1322+
0x84, 0xC9, 0XB2, 0xA7, 0XB3, 0x6E, 0x00, 0x00,
13231323
0xAA, 0xAA, 0x03, 0x00, 0x00, 0x00, 0x08, 0x06,
13241324
0x00, 0x01, 0x08, 0x00, 0x06, 0x04, 0x00, 0x02,
13251325
0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02, 0x00, 0x00,
@@ -1521,8 +1521,8 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
15211521
struct sk_buff *skb = NULL;
15221522
u32 totalpacketlen;
15231523
bool rtstatus;
1524-
u8 u1RsvdPageLoc[5] = { 0 };
1525-
u8 u1RsvdPageLoc2[7] = { 0 };
1524+
u8 u1rsvdpageloc[5] = { 0 };
1525+
u8 u1rsvdpageloc2[7] = { 0 };
15261526
bool b_dlok = false;
15271527
u8 *beacon;
15281528
u8 *p_pspoll;
@@ -1552,7 +1552,7 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
15521552
SET_80211_PS_POLL_BSSID(p_pspoll, mac->bssid);
15531553
SET_80211_PS_POLL_TA(p_pspoll, mac->mac_addr);
15541554

1555-
SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1RsvdPageLoc, PSPOLL_PG);
1555+
SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1rsvdpageloc, PSPOLL_PG);
15561556

15571557
/*--------------------------------------------------------
15581558
* (3) null data
@@ -1563,7 +1563,7 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
15631563
SET_80211_HDR_ADDRESS2(nullfunc, mac->mac_addr);
15641564
SET_80211_HDR_ADDRESS3(nullfunc, mac->bssid);
15651565

1566-
SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(u1RsvdPageLoc, NULL_PG);
1566+
SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(u1rsvdpageloc, NULL_PG);
15671567

15681568
/*---------------------------------------------------------
15691569
* (4) Qos null data
@@ -1574,7 +1574,7 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
15741574
SET_80211_HDR_ADDRESS2(qosnull, mac->mac_addr);
15751575
SET_80211_HDR_ADDRESS3(qosnull, mac->bssid);
15761576

1577-
SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(u1RsvdPageLoc, QOSNULL_PG);
1577+
SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(u1rsvdpageloc, QOSNULL_PG);
15781578

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

1588-
SET_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(u1RsvdPageLoc, BT_QOSNULL_PG);
1588+
SET_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(u1rsvdpageloc, BT_QOSNULL_PG);
15891589

15901590
if (!dl_whole_packets) {
15911591
totalpacketlen = 512 * (BT_QOSNULL_PG + 1) - 40;
@@ -1600,20 +1600,20 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
16001600
SET_80211_HDR_ADDRESS2(arpresp, mac->mac_addr);
16011601
SET_80211_HDR_ADDRESS3(arpresp, mac->bssid);
16021602

1603-
SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_ARP_RSP(u1RsvdPageLoc2, ARPRESP_PG);
1603+
SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_ARP_RSP(u1rsvdpageloc2, ARPRESP_PG);
16041604

16051605
/*---------------------------------------------------------
16061606
* (7) Remote Wake Ctrl
16071607
*----------------------------------------------------------
16081608
*/
1609-
SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_REMOTE_WAKE_CTRL_INFO(u1RsvdPageLoc2,
1609+
SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_REMOTE_WAKE_CTRL_INFO(u1rsvdpageloc2,
16101610
REMOTE_PG);
16111611

16121612
/*---------------------------------------------------------
16131613
* (8) GTK Ext Memory
16141614
*----------------------------------------------------------
16151615
*/
1616-
SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(u1RsvdPageLoc2, GTKEXT_PG);
1616+
SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(u1rsvdpageloc2, GTKEXT_PG);
16171617

16181618
totalpacketlen = TOTAL_RESERVED_PKT_LEN_8812 - 40;
16191619

@@ -1632,14 +1632,14 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
16321632

16331633
if (!b_dl_finished && b_dlok) {
16341634
RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
1635-
"H2C_RSVDPAGE:\n", u1RsvdPageLoc, 5);
1635+
"H2C_RSVDPAGE:\n", u1rsvdpageloc, 5);
16361636
rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_RSVDPAGE,
1637-
sizeof(u1RsvdPageLoc), u1RsvdPageLoc);
1637+
sizeof(u1rsvdpageloc), u1rsvdpageloc);
16381638
if (dl_whole_packets) {
16391639
RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
1640-
"wowlan H2C_RSVDPAGE:\n", u1RsvdPageLoc2, 7);
1640+
"wowlan H2C_RSVDPAGE:\n", u1rsvdpageloc2, 7);
16411641
rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_AOAC_RSVDPAGE,
1642-
sizeof(u1RsvdPageLoc2), u1RsvdPageLoc2);
1642+
sizeof(u1rsvdpageloc2), u1rsvdpageloc2);
16431643
}
16441644
}
16451645

@@ -1656,8 +1656,8 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
16561656
struct sk_buff *skb = NULL;
16571657
u32 totalpacketlen;
16581658
bool rtstatus;
1659-
u8 u1RsvdPageLoc[5] = { 0 };
1660-
u8 u1RsvdPageLoc2[7] = { 0 };
1659+
u8 u1rsvdpageloc[5] = { 0 };
1660+
u8 u1rsvdpageloc2[7] = { 0 };
16611661
bool b_dlok = false;
16621662
u8 *beacon;
16631663
u8 *p_pspoll;
@@ -1687,7 +1687,7 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
16871687
SET_80211_PS_POLL_BSSID(p_pspoll, mac->bssid);
16881688
SET_80211_PS_POLL_TA(p_pspoll, mac->mac_addr);
16891689

1690-
SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1RsvdPageLoc, PSPOLL_PG);
1690+
SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1rsvdpageloc, PSPOLL_PG);
16911691

16921692
/*--------------------------------------------------------
16931693
* (3) null data
@@ -1698,7 +1698,7 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
16981698
SET_80211_HDR_ADDRESS2(nullfunc, mac->mac_addr);
16991699
SET_80211_HDR_ADDRESS3(nullfunc, mac->bssid);
17001700

1701-
SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(u1RsvdPageLoc, NULL_PG);
1701+
SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(u1rsvdpageloc, NULL_PG);
17021702

17031703
/*---------------------------------------------------------
17041704
* (4) Qos null data
@@ -1709,7 +1709,7 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
17091709
SET_80211_HDR_ADDRESS2(qosnull, mac->mac_addr);
17101710
SET_80211_HDR_ADDRESS3(qosnull, mac->bssid);
17111711

1712-
SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(u1RsvdPageLoc, QOSNULL_PG);
1712+
SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(u1rsvdpageloc, QOSNULL_PG);
17131713

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

1723-
SET_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(u1RsvdPageLoc, BT_QOSNULL_PG);
1723+
SET_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(u1rsvdpageloc, BT_QOSNULL_PG);
17241724

17251725
if (!dl_whole_packets) {
17261726
totalpacketlen = 256 * (BT_QOSNULL_PG + 1) - 40;
@@ -1735,20 +1735,20 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
17351735
SET_80211_HDR_ADDRESS2(arpresp, mac->mac_addr);
17361736
SET_80211_HDR_ADDRESS3(arpresp, mac->bssid);
17371737

1738-
SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_ARP_RSP(u1RsvdPageLoc2, ARPRESP_PG);
1738+
SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_ARP_RSP(u1rsvdpageloc2, ARPRESP_PG);
17391739

17401740
/*---------------------------------------------------------
17411741
* (7) Remote Wake Ctrl
17421742
*----------------------------------------------------------
17431743
*/
1744-
SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_REMOTE_WAKE_CTRL_INFO(u1RsvdPageLoc2,
1744+
SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_REMOTE_WAKE_CTRL_INFO(u1rsvdpageloc2,
17451745
REMOTE_PG);
17461746

17471747
/*---------------------------------------------------------
17481748
* (8) GTK Ext Memory
17491749
*----------------------------------------------------------
17501750
*/
1751-
SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(u1RsvdPageLoc2, GTKEXT_PG);
1751+
SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(u1rsvdpageloc2, GTKEXT_PG);
17521752

17531753
totalpacketlen = TOTAL_RESERVED_PKT_LEN_8821 - 40;
17541754

@@ -1770,16 +1770,16 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
17701770
RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
17711771
"Set RSVD page location to Fw.\n");
17721772
RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
1773-
"H2C_RSVDPAGE:\n", u1RsvdPageLoc, 5);
1773+
"H2C_RSVDPAGE:\n", u1rsvdpageloc, 5);
17741774
rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_RSVDPAGE,
1775-
sizeof(u1RsvdPageLoc), u1RsvdPageLoc);
1775+
sizeof(u1rsvdpageloc), u1rsvdpageloc);
17761776
if (dl_whole_packets) {
17771777
RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
17781778
"wowlan H2C_RSVDPAGE:\n",
1779-
u1RsvdPageLoc2, 7);
1779+
u1rsvdpageloc2, 7);
17801780
rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_AOAC_RSVDPAGE,
1781-
sizeof(u1RsvdPageLoc2),
1782-
u1RsvdPageLoc2);
1781+
sizeof(u1rsvdpageloc2),
1782+
u1rsvdpageloc2);
17831783
}
17841784
}
17851785

0 commit comments

Comments
 (0)