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

staging: wilc1000: rename pu8ssid of struct connect_attr

This patch renames pu8ssid of struct connect_attr to ssid 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 9254db07
...@@ -109,7 +109,7 @@ struct scan_attr { ...@@ -109,7 +109,7 @@ struct scan_attr {
struct connect_attr { struct connect_attr {
u8 *bssid; u8 *bssid;
u8 *pu8ssid; u8 *ssid;
size_t ssidLen; size_t ssidLen;
u8 *pu8IEs; u8 *pu8IEs;
size_t IEsLen; size_t IEsLen;
...@@ -1037,9 +1037,9 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv, ...@@ -1037,9 +1037,9 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
} }
hif_drv->strWILC_UsrConnReq.ssidLen = pstrHostIFconnectAttr->ssidLen; hif_drv->strWILC_UsrConnReq.ssidLen = pstrHostIFconnectAttr->ssidLen;
if (pstrHostIFconnectAttr->pu8ssid != NULL) { if (pstrHostIFconnectAttr->ssid != NULL) {
hif_drv->strWILC_UsrConnReq.pu8ssid = kmalloc(pstrHostIFconnectAttr->ssidLen + 1, GFP_KERNEL); hif_drv->strWILC_UsrConnReq.pu8ssid = kmalloc(pstrHostIFconnectAttr->ssidLen + 1, GFP_KERNEL);
memcpy(hif_drv->strWILC_UsrConnReq.pu8ssid, pstrHostIFconnectAttr->pu8ssid, memcpy(hif_drv->strWILC_UsrConnReq.pu8ssid, pstrHostIFconnectAttr->ssid,
pstrHostIFconnectAttr->ssidLen); pstrHostIFconnectAttr->ssidLen);
hif_drv->strWILC_UsrConnReq.pu8ssid[pstrHostIFconnectAttr->ssidLen] = '\0'; hif_drv->strWILC_UsrConnReq.pu8ssid[pstrHostIFconnectAttr->ssidLen] = '\0';
} }
...@@ -1081,7 +1081,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv, ...@@ -1081,7 +1081,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
strWIDList[u32WidsCount].size = hif_drv->strWILC_UsrConnReq.ConnReqIEsLen; strWIDList[u32WidsCount].size = hif_drv->strWILC_UsrConnReq.ConnReqIEsLen;
u32WidsCount++; u32WidsCount++;
if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7)) { if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7)) {
gu32FlushedInfoElemAsocSize = hif_drv->strWILC_UsrConnReq.ConnReqIEsLen; gu32FlushedInfoElemAsocSize = hif_drv->strWILC_UsrConnReq.ConnReqIEsLen;
gu8FlushedInfoElemAsoc = kmalloc(gu32FlushedInfoElemAsocSize, GFP_KERNEL); gu8FlushedInfoElemAsoc = kmalloc(gu32FlushedInfoElemAsocSize, GFP_KERNEL);
...@@ -1095,7 +1095,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv, ...@@ -1095,7 +1095,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
strWIDList[u32WidsCount].val = (s8 *)(&(hif_drv->strWILC_UsrConnReq.u8security)); strWIDList[u32WidsCount].val = (s8 *)(&(hif_drv->strWILC_UsrConnReq.u8security));
u32WidsCount++; u32WidsCount++;
if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7)) if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7))
gu8Flushed11iMode = hif_drv->strWILC_UsrConnReq.u8security; gu8Flushed11iMode = hif_drv->strWILC_UsrConnReq.u8security;
PRINT_INFO(HOSTINF_DBG, "Encrypt Mode = %x\n", hif_drv->strWILC_UsrConnReq.u8security); PRINT_INFO(HOSTINF_DBG, "Encrypt Mode = %x\n", hif_drv->strWILC_UsrConnReq.u8security);
...@@ -1107,7 +1107,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv, ...@@ -1107,7 +1107,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
strWIDList[u32WidsCount].val = (s8 *)(&hif_drv->strWILC_UsrConnReq.tenuAuth_type); strWIDList[u32WidsCount].val = (s8 *)(&hif_drv->strWILC_UsrConnReq.tenuAuth_type);
u32WidsCount++; u32WidsCount++;
if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7)) if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7))
gu8FlushedAuthType = (u8)hif_drv->strWILC_UsrConnReq.tenuAuth_type; gu8FlushedAuthType = (u8)hif_drv->strWILC_UsrConnReq.tenuAuth_type;
PRINT_INFO(HOSTINF_DBG, "Authentication Type = %x\n", hif_drv->strWILC_UsrConnReq.tenuAuth_type); PRINT_INFO(HOSTINF_DBG, "Authentication Type = %x\n", hif_drv->strWILC_UsrConnReq.tenuAuth_type);
...@@ -1119,7 +1119,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv, ...@@ -1119,7 +1119,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
strWIDList[u32WidsCount].size = 112; strWIDList[u32WidsCount].size = 112;
strWIDList[u32WidsCount].val = kmalloc(strWIDList[u32WidsCount].size, GFP_KERNEL); strWIDList[u32WidsCount].val = kmalloc(strWIDList[u32WidsCount].size, GFP_KERNEL);
if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7)) { if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7)) {
gu32FlushedJoinReqSize = strWIDList[u32WidsCount].size; gu32FlushedJoinReqSize = strWIDList[u32WidsCount].size;
gu8FlushedJoinReq = kmalloc(gu32FlushedJoinReqSize, GFP_KERNEL); gu8FlushedJoinReq = kmalloc(gu32FlushedJoinReqSize, GFP_KERNEL);
} }
...@@ -1131,8 +1131,8 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv, ...@@ -1131,8 +1131,8 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
pu8CurrByte = strWIDList[u32WidsCount].val; pu8CurrByte = strWIDList[u32WidsCount].val;
if (pstrHostIFconnectAttr->pu8ssid != NULL) { if (pstrHostIFconnectAttr->ssid != NULL) {
memcpy(pu8CurrByte, pstrHostIFconnectAttr->pu8ssid, pstrHostIFconnectAttr->ssidLen); memcpy(pu8CurrByte, pstrHostIFconnectAttr->ssid, pstrHostIFconnectAttr->ssidLen);
pu8CurrByte[pstrHostIFconnectAttr->ssidLen] = '\0'; pu8CurrByte[pstrHostIFconnectAttr->ssidLen] = '\0';
} }
pu8CurrByte += MAX_SSID_LEN; pu8CurrByte += MAX_SSID_LEN;
...@@ -1223,7 +1223,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv, ...@@ -1223,7 +1223,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
u32WidsCount++; u32WidsCount++;
gu32WidConnRstHack = 0; gu32WidConnRstHack = 0;
if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7)) { if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7)) {
memcpy(gu8FlushedJoinReq, pu8CurrByte, gu32FlushedJoinReqSize); memcpy(gu8FlushedJoinReq, pu8CurrByte, gu32FlushedJoinReqSize);
gu8FlushedJoinReqDrvHandler = hif_drv; gu8FlushedJoinReqDrvHandler = hif_drv;
} }
...@@ -1292,9 +1292,9 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv, ...@@ -1292,9 +1292,9 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
pstrHostIFconnectAttr->bssid = NULL; pstrHostIFconnectAttr->bssid = NULL;
} }
if (pstrHostIFconnectAttr->pu8ssid != NULL) { if (pstrHostIFconnectAttr->ssid != NULL) {
kfree(pstrHostIFconnectAttr->pu8ssid); kfree(pstrHostIFconnectAttr->ssid);
pstrHostIFconnectAttr->pu8ssid = NULL; pstrHostIFconnectAttr->ssid = NULL;
} }
if (pstrHostIFconnectAttr->pu8IEs != NULL) { if (pstrHostIFconnectAttr->pu8IEs != NULL) {
...@@ -3626,10 +3626,8 @@ s32 host_int_set_join_req(struct host_if_drv *hif_drv, u8 *pu8bssid, ...@@ -3626,10 +3626,8 @@ s32 host_int_set_join_req(struct host_if_drv *hif_drv, u8 *pu8bssid,
if (pu8ssid != NULL) { if (pu8ssid != NULL) {
msg.body.con_info.ssidLen = ssidLen; msg.body.con_info.ssidLen = ssidLen;
msg.body.con_info.pu8ssid = kmalloc(ssidLen, GFP_KERNEL); msg.body.con_info.ssid = kmalloc(ssidLen, GFP_KERNEL);
memcpy(msg.body.con_info.pu8ssid, memcpy(msg.body.con_info.ssid, pu8ssid, ssidLen);
pu8ssid, ssidLen);
} }
if (pu8IEs != NULL) { if (pu8IEs != NULL) {
......
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