Commit 044a6410 authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman

staging: wilc1000: rename variable gu8FlushedJoinReq

This patch renames variable gu8FlushedJoinReq to join_req
to avoid CamelCase naming convention.
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarTony Cho <tony.cho@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7a9adb05
...@@ -255,7 +255,7 @@ static u8 get_ip[2][4]; ...@@ -255,7 +255,7 @@ static u8 get_ip[2][4];
static u32 inactive_time; static u32 inactive_time;
static u8 del_beacon; static u8 del_beacon;
u8 *gu8FlushedJoinReq; u8 *join_req;
u8 *gu8FlushedInfoElemAsoc; u8 *gu8FlushedInfoElemAsoc;
u8 gu8Flushed11iMode; u8 gu8Flushed11iMode;
u8 gu8FlushedAuthType; u8 gu8FlushedAuthType;
...@@ -1100,7 +1100,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv, ...@@ -1100,7 +1100,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7)) { if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7)) {
gu32FlushedJoinReqSize = strWIDList[u32WidsCount].size; gu32FlushedJoinReqSize = strWIDList[u32WidsCount].size;
gu8FlushedJoinReq = kmalloc(gu32FlushedJoinReqSize, GFP_KERNEL); join_req = kmalloc(gu32FlushedJoinReqSize, GFP_KERNEL);
} }
if (strWIDList[u32WidsCount].val == NULL) { if (strWIDList[u32WidsCount].val == NULL) {
s32Error = -EFAULT; s32Error = -EFAULT;
...@@ -1199,7 +1199,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv, ...@@ -1199,7 +1199,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
u32WidsCount++; u32WidsCount++;
if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7)) { if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7)) {
memcpy(gu8FlushedJoinReq, pu8CurrByte, gu32FlushedJoinReqSize); memcpy(join_req, pu8CurrByte, gu32FlushedJoinReqSize);
gu8FlushedJoinReqDrvHandler = hif_drv; gu8FlushedJoinReqDrvHandler = hif_drv;
} }
...@@ -1303,7 +1303,7 @@ static s32 Handle_FlushConnect(struct host_if_drv *hif_drv) ...@@ -1303,7 +1303,7 @@ static s32 Handle_FlushConnect(struct host_if_drv *hif_drv)
strWIDList[u32WidsCount].id = (u16)WID_JOIN_REQ_EXTENDED; strWIDList[u32WidsCount].id = (u16)WID_JOIN_REQ_EXTENDED;
strWIDList[u32WidsCount].type = WID_STR; strWIDList[u32WidsCount].type = WID_STR;
strWIDList[u32WidsCount].size = gu32FlushedJoinReqSize; strWIDList[u32WidsCount].size = gu32FlushedJoinReqSize;
strWIDList[u32WidsCount].val = (s8 *)gu8FlushedJoinReq; strWIDList[u32WidsCount].val = (s8 *)join_req;
pu8CurrByte = strWIDList[u32WidsCount].val; pu8CurrByte = strWIDList[u32WidsCount].val;
pu8CurrByte += FLUSHED_BYTE_POS; pu8CurrByte += FLUSHED_BYTE_POS;
...@@ -1385,9 +1385,9 @@ static s32 Handle_ConnectTimeout(struct host_if_drv *hif_drv) ...@@ -1385,9 +1385,9 @@ static s32 Handle_ConnectTimeout(struct host_if_drv *hif_drv)
eth_zero_addr(u8ConnectedSSID); eth_zero_addr(u8ConnectedSSID);
if (gu8FlushedJoinReq != NULL && gu8FlushedJoinReqDrvHandler == hif_drv) { if (join_req != NULL && gu8FlushedJoinReqDrvHandler == hif_drv) {
kfree(gu8FlushedJoinReq); kfree(join_req);
gu8FlushedJoinReq = NULL; join_req = NULL;
} }
if (gu8FlushedInfoElemAsoc != NULL && gu8FlushedJoinReqDrvHandler == hif_drv) { if (gu8FlushedInfoElemAsoc != NULL && gu8FlushedJoinReqDrvHandler == hif_drv) {
kfree(gu8FlushedInfoElemAsoc); kfree(gu8FlushedInfoElemAsoc);
...@@ -1682,9 +1682,9 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv *hif_drv, ...@@ -1682,9 +1682,9 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv *hif_drv,
hif_drv->strWILC_UsrConnReq.ConnReqIEsLen = 0; hif_drv->strWILC_UsrConnReq.ConnReqIEsLen = 0;
kfree(hif_drv->strWILC_UsrConnReq.pu8ConnReqIEs); kfree(hif_drv->strWILC_UsrConnReq.pu8ConnReqIEs);
if (gu8FlushedJoinReq != NULL && gu8FlushedJoinReqDrvHandler == hif_drv) { if (join_req != NULL && gu8FlushedJoinReqDrvHandler == hif_drv) {
kfree(gu8FlushedJoinReq); kfree(join_req);
gu8FlushedJoinReq = NULL; join_req = NULL;
} }
if (gu8FlushedInfoElemAsoc != NULL && gu8FlushedJoinReqDrvHandler == hif_drv) { if (gu8FlushedInfoElemAsoc != NULL && gu8FlushedJoinReqDrvHandler == hif_drv) {
kfree(gu8FlushedInfoElemAsoc); kfree(gu8FlushedInfoElemAsoc);
...@@ -2072,9 +2072,9 @@ static void Handle_Disconnect(struct host_if_drv *hif_drv) ...@@ -2072,9 +2072,9 @@ static void Handle_Disconnect(struct host_if_drv *hif_drv)
hif_drv->strWILC_UsrConnReq.ConnReqIEsLen = 0; hif_drv->strWILC_UsrConnReq.ConnReqIEsLen = 0;
kfree(hif_drv->strWILC_UsrConnReq.pu8ConnReqIEs); kfree(hif_drv->strWILC_UsrConnReq.pu8ConnReqIEs);
if (gu8FlushedJoinReq != NULL && gu8FlushedJoinReqDrvHandler == hif_drv) { if (join_req != NULL && gu8FlushedJoinReqDrvHandler == hif_drv) {
kfree(gu8FlushedJoinReq); kfree(join_req);
gu8FlushedJoinReq = NULL; join_req = NULL;
} }
if (gu8FlushedInfoElemAsoc != NULL && gu8FlushedJoinReqDrvHandler == hif_drv) { if (gu8FlushedInfoElemAsoc != NULL && gu8FlushedJoinReqDrvHandler == hif_drv) {
kfree(gu8FlushedInfoElemAsoc); kfree(gu8FlushedInfoElemAsoc);
...@@ -3600,7 +3600,7 @@ s32 host_int_flush_join_req(struct host_if_drv *hif_drv) ...@@ -3600,7 +3600,7 @@ s32 host_int_flush_join_req(struct host_if_drv *hif_drv)
s32 s32Error = 0; s32 s32Error = 0;
struct host_if_msg msg; struct host_if_msg msg;
if (!gu8FlushedJoinReq) { if (!join_req) {
s32Error = -EFAULT; s32Error = -EFAULT;
return s32Error; return s32Error;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment