p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

staging: wilc1000: rename pu8ReqIEs in struct connect_info 

This patch renames pu8ReqIEs to req_ies to avoid camelcase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Chaehyun Lim 2016-02-25 09:15:44 +09:00 committed by Greg Kroah-Hartman
parent d4a24e082b
commit 4ff4857076
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/wilc1000/coreconfigurator.h
View File

@ -107,7 +107,7 @@ struct connect_resp_info {
struct connect_info { struct connect_info {
u8 bssid[6]; u8 bssid[6];
u8 *pu8ReqIEs; u8 *req_ies;
size_t ReqIEsLen; size_t ReqIEsLen;
u8 *pu8RespIEs; u8 *pu8RespIEs;
u16 u16RespIEsLen; u16 u16RespIEsLen;

24
drivers/staging/wilc1000/host_interface.c
View File

@ -1159,8 +1159,8 @@ static s32 Handle_Connect(struct wilc_vif *vif,
if (pstrHostIFconnectAttr->ies) { if (pstrHostIFconnectAttr->ies) {
strConnectInfo.ReqIEsLen = pstrHostIFconnectAttr->ies_len; strConnectInfo.ReqIEsLen = pstrHostIFconnectAttr->ies_len;
strConnectInfo.pu8ReqIEs = kmalloc(pstrHostIFconnectAttr->ies_len, GFP_KERNEL); strConnectInfo.req_ies = kmalloc(pstrHostIFconnectAttr->ies_len, GFP_KERNEL);
memcpy(strConnectInfo.pu8ReqIEs, memcpy(strConnectInfo.req_ies,
pstrHostIFconnectAttr->ies, pstrHostIFconnectAttr->ies,
pstrHostIFconnectAttr->ies_len); pstrHostIFconnectAttr->ies_len);
} }
@ -1171,8 +1171,8 @@ static s32 Handle_Connect(struct wilc_vif *vif,
NULL, NULL,
pstrHostIFconnectAttr->arg); pstrHostIFconnectAttr->arg);
hif_drv->hif_state = HOST_IF_IDLE; hif_drv->hif_state = HOST_IF_IDLE;
kfree(strConnectInfo.pu8ReqIEs); kfree(strConnectInfo.req_ies);
strConnectInfo.pu8ReqIEs = NULL; strConnectInfo.req_ies = NULL;
} else { } else {
netdev_err(vif->ndev, "Connect callback is NULL\n"); netdev_err(vif->ndev, "Connect callback is NULL\n");
@ -1266,8 +1266,8 @@ static s32 Handle_ConnectTimeout(struct wilc_vif *vif)
if (hif_drv->usr_conn_req.ies) { if (hif_drv->usr_conn_req.ies) {
strConnectInfo.ReqIEsLen = hif_drv->usr_conn_req.ies_len; strConnectInfo.ReqIEsLen = hif_drv->usr_conn_req.ies_len;
strConnectInfo.pu8ReqIEs = kmalloc(hif_drv->usr_conn_req.ies_len, GFP_KERNEL); strConnectInfo.req_ies = kmalloc(hif_drv->usr_conn_req.ies_len, GFP_KERNEL);
memcpy(strConnectInfo.pu8ReqIEs, memcpy(strConnectInfo.req_ies,
hif_drv->usr_conn_req.ies, hif_drv->usr_conn_req.ies,
hif_drv->usr_conn_req.ies_len); hif_drv->usr_conn_req.ies_len);
} }
@ -1278,8 +1278,8 @@ static s32 Handle_ConnectTimeout(struct wilc_vif *vif)
NULL, NULL,
hif_drv->usr_conn_req.arg); hif_drv->usr_conn_req.arg);
kfree(strConnectInfo.pu8ReqIEs); kfree(strConnectInfo.req_ies);
strConnectInfo.pu8ReqIEs = NULL; strConnectInfo.req_ies = NULL;
} else { } else {
netdev_err(vif->ndev, "Connect callback is NULL\n"); netdev_err(vif->ndev, "Connect callback is NULL\n");
} }
@ -1503,8 +1503,8 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
if (hif_drv->usr_conn_req.ies) { if (hif_drv->usr_conn_req.ies) {
strConnectInfo.ReqIEsLen = hif_drv->usr_conn_req.ies_len; strConnectInfo.ReqIEsLen = hif_drv->usr_conn_req.ies_len;
strConnectInfo.pu8ReqIEs = kmalloc(hif_drv->usr_conn_req.ies_len, GFP_KERNEL); strConnectInfo.req_ies = kmalloc(hif_drv->usr_conn_req.ies_len, GFP_KERNEL);
memcpy(strConnectInfo.pu8ReqIEs, memcpy(strConnectInfo.req_ies,
hif_drv->usr_conn_req.ies, hif_drv->usr_conn_req.ies,
hif_drv->usr_conn_req.ies_len); hif_drv->usr_conn_req.ies_len);
} }
@ -1533,8 +1533,8 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
kfree(strConnectInfo.pu8RespIEs); kfree(strConnectInfo.pu8RespIEs);
strConnectInfo.pu8RespIEs = NULL; strConnectInfo.pu8RespIEs = NULL;
kfree(strConnectInfo.pu8ReqIEs); kfree(strConnectInfo.req_ies);
strConnectInfo.pu8ReqIEs = NULL; strConnectInfo.req_ies = NULL;
hif_drv->usr_conn_req.ssid_len = 0; hif_drv->usr_conn_req.ssid_len = 0;
kfree(hif_drv->usr_conn_req.ssid); kfree(hif_drv->usr_conn_req.ssid);
hif_drv->usr_conn_req.ssid = NULL; hif_drv->usr_conn_req.ssid = NULL;

2
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
View File

@ -544,7 +544,7 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent,
} }
cfg80211_connect_result(dev, pstrConnectInfo->bssid, cfg80211_connect_result(dev, pstrConnectInfo->bssid,
pstrConnectInfo->pu8ReqIEs, pstrConnectInfo->ReqIEsLen, pstrConnectInfo->req_ies, pstrConnectInfo->ReqIEsLen,
pstrConnectInfo->pu8RespIEs, pstrConnectInfo->u16RespIEsLen, pstrConnectInfo->pu8RespIEs, pstrConnectInfo->u16RespIEsLen,
u16ConnectStatus, GFP_KERNEL); u16ConnectStatus, GFP_KERNEL);
} else if (enuConnDisconnEvent == CONN_DISCONN_EVENT_DISCONN_NOTIF) { } else if (enuConnDisconnEvent == CONN_DISCONN_EVENT_DISCONN_NOTIF) {