hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: wilc1000: renames u16RxLen variable 

This patch renames u16RxLen variable to rx_len to avoid camelcase.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Leo Kim 2016-01-28 16:13:36 +09:00 committed by Greg Kroah-Hartman
parent 43b36e42a5
commit e1a9db87a6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/staging/wilc1000/coreconfigurator.c
View File

@ -241,13 +241,13 @@ static inline u16 get_asoc_id(u8 *data)
return asoc_id; return asoc_id;
} }
static u8 *get_tim_elm(u8 *pu8msa, u16 u16RxLen, u16 u16TagParamOffset) static u8 *get_tim_elm(u8 *pu8msa, u16 rx_len, u16 u16TagParamOffset)
{ {
u16 u16index; u16 u16index;
u16index = u16TagParamOffset; u16index = u16TagParamOffset;
while (u16index < (u16RxLen - FCS_LEN)) { while (u16index < (rx_len - FCS_LEN)) {
if (pu8msa[u16index] == ITIM) if (pu8msa[u16index] == ITIM)
return &pu8msa[u16index]; return &pu8msa[u16index];
u16index += (IE_HDR_LEN + pu8msa[u16index + 1]); u16index += (IE_HDR_LEN + pu8msa[u16index + 1]);
@ -256,12 +256,12 @@ static u8 *get_tim_elm(u8 *pu8msa, u16 u16RxLen, u16 u16TagParamOffset)
return NULL; return NULL;
} }
static u8 get_current_channel_802_11n(u8 *pu8msa, u16 u16RxLen) static u8 get_current_channel_802_11n(u8 *pu8msa, u16 rx_len)
{ {
u16 index; u16 index;
index = TAG_PARAM_OFFSET; index = TAG_PARAM_OFFSET;
while (index < (u16RxLen - FCS_LEN)) { while (index < (rx_len - FCS_LEN)) {
if (pu8msa[index] == IDSPARMS) if (pu8msa[index] == IDSPARMS)
return pu8msa[index + 2]; return pu8msa[index + 2];
index += pu8msa[index + 1] + IE_HDR_LEN; index += pu8msa[index + 1] + IE_HDR_LEN;
@ -296,7 +296,7 @@ s32 wilc_parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo
{ {
u8 *pu8msa = NULL; u8 *pu8msa = NULL;
u16 u16RxLen = 0; u16 rx_len = 0;
u8 *pu8TimElm = NULL; u8 *pu8TimElm = NULL;
u8 *pu8IEs = NULL; u8 *pu8IEs = NULL;
u16 u16IEsLen = 0; u16 u16IEsLen = 0;
@ -312,7 +312,7 @@ s32 wilc_parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo
pu8msa = &pu8WidVal[1]; pu8msa = &pu8WidVal[1];
u16RxLen = u16WidLen - 1; rx_len = u16WidLen - 1;
pstrNetworkInfo->u16CapInfo = get_cap_info(pu8msa); pstrNetworkInfo->u16CapInfo = get_cap_info(pu8msa);
pstrNetworkInfo->u32Tsf = get_beacon_timestamp_lo(pu8msa); pstrNetworkInfo->u32Tsf = get_beacon_timestamp_lo(pu8msa);
PRINT_D(CORECONFIG_DBG, "TSF :%x\n", pstrNetworkInfo->u32Tsf); PRINT_D(CORECONFIG_DBG, "TSF :%x\n", pstrNetworkInfo->u32Tsf);
@ -326,7 +326,7 @@ s32 wilc_parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo
get_BSSID(pu8msa, pstrNetworkInfo->au8bssid); get_BSSID(pu8msa, pstrNetworkInfo->au8bssid);
pstrNetworkInfo->u8channel = get_current_channel_802_11n(pu8msa, pstrNetworkInfo->u8channel = get_current_channel_802_11n(pu8msa,
u16RxLen + FCS_LEN); rx_len + FCS_LEN);
u8index = MAC_HDR_LEN + TIME_STAMP_LEN; u8index = MAC_HDR_LEN + TIME_STAMP_LEN;
@ -334,11 +334,11 @@ s32 wilc_parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo
u8index += BEACON_INTERVAL_LEN + CAP_INFO_LEN; u8index += BEACON_INTERVAL_LEN + CAP_INFO_LEN;
pu8TimElm = get_tim_elm(pu8msa, u16RxLen + FCS_LEN, u8index); pu8TimElm = get_tim_elm(pu8msa, rx_len + FCS_LEN, u8index);
if (pu8TimElm) if (pu8TimElm)
pstrNetworkInfo->u8DtimPeriod = pu8TimElm[3]; pstrNetworkInfo->u8DtimPeriod = pu8TimElm[3];
pu8IEs = &pu8msa[MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + CAP_INFO_LEN]; pu8IEs = &pu8msa[MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + CAP_INFO_LEN];
u16IEsLen = u16RxLen - (MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + CAP_INFO_LEN); u16IEsLen = rx_len - (MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + CAP_INFO_LEN);
if (u16IEsLen > 0) { if (u16IEsLen > 0) {
pstrNetworkInfo->pu8IEs = kmemdup(pu8IEs, u16IEsLen, pstrNetworkInfo->pu8IEs = kmemdup(pu8IEs, u16IEsLen,