* [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg
@ 2015-09-18 9:11 Tony Cho
2015-09-18 9:11 ` [PATCH 02/34] staging: wilc1000: remove typedef from the struct Tony Cho
` (32 more replies)
0 siblings, 33 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch changes the name, tstrHostIFmsg to host_if_msg not to use
camelcase notation in the Linux.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 294 +++++++++++++++---------------
1 file changed, 147 insertions(+), 147 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 151e8c4..d272091 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -450,7 +450,7 @@ typedef union _tuniHostIFmsgBody {
} tuniHostIFmsgBody;
/*!
- * @struct tstrHostIFmsg
+ * @struct host_if_msg
* @brief Host Interface message
* @details
* @todo
@@ -459,11 +459,11 @@ typedef union _tuniHostIFmsgBody {
* @date 25 March 2012
* @version 1.0
*/
-typedef struct _tstrHostIFmsg {
+typedef struct _host_if_msg {
u16 u16MsgId; /*!< Message ID */
tuniHostIFmsgBody uniHostIFmsgBody; /*!< Message body */
tstrWILC_WFIDrv *drvHandler;
-} tstrHostIFmsg;
+} host_if_msg;
#ifdef CONNECT_DIRECT
typedef struct _tstrWidJoinReqExt {
@@ -3984,19 +3984,19 @@ _done_:
static void ListenTimerCB(unsigned long arg)
{
s32 s32Error = 0;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)arg;
/*Stopping remain-on-channel timer*/
del_timer(&pstrWFIDrv->hRemainOnChannel);
/* prepare the Timer Callback message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_LISTEN_TIMER_FIRED;
strHostIFmsg.drvHandler = pstrWFIDrv;
strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID = pstrWFIDrv->strHostIfRemainOnChan.u32ListenSessionID;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
}
@@ -4315,13 +4315,13 @@ static s32 Handle_DelAllRxBASessions(tstrWILC_WFIDrv *drvHandler, tstrHostIfBASe
static int hostIFthread(void *pvArg)
{
u32 u32Ret;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
tstrWILC_WFIDrv *pstrWFIDrv;
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
while (1) {
- wilc_mq_recv(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), &u32Ret);
+ wilc_mq_recv(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg), &u32Ret);
pstrWFIDrv = (tstrWILC_WFIDrv *)strHostIFmsg.drvHandler;
if (strHostIFmsg.u16MsgId == HOST_IF_MSG_EXIT) {
PRINT_D(GENERIC_DBG, "THREAD: Exiting HostIfThread\n");
@@ -4333,13 +4333,13 @@ static int hostIFthread(void *pvArg)
if ((!g_wilc_initialized)) {
PRINT_D(GENERIC_DBG, "--WAIT--");
usleep_range(200 * 1000, 200 * 1000);
- wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
continue;
}
if (strHostIFmsg.u16MsgId == HOST_IF_MSG_CONNECT && pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult != NULL) {
PRINT_D(HOSTINF_DBG, "Requeue connect request till scan done received\n");
- wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
usleep_range(2 * 1000, 2 * 1000);
continue;
}
@@ -4533,29 +4533,29 @@ static int hostIFthread(void *pvArg)
static void TimerCB_Scan(unsigned long arg)
{
void *pvArg = (void *)arg;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
/* prepare the Timer Callback message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.drvHandler = pvArg;
strHostIFmsg.u16MsgId = HOST_IF_MSG_SCAN_TIMER_FIRED;
/* send the message */
- wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
}
static void TimerCB_Connect(unsigned long arg)
{
void *pvArg = (void *)arg;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
/* prepare the Timer Callback message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.drvHandler = pvArg;
strHostIFmsg.u16MsgId = HOST_IF_MSG_CONNECT_TIMER_FIRED;
/* send the message */
- wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
}
@@ -4605,7 +4605,7 @@ s32 host_int_remove_wep_key(tstrWILC_WFIDrv *hWFIDrv, u8 u8keyIdx)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
if (pstrWFIDrv == NULL) {
@@ -4615,7 +4615,7 @@ s32 host_int_remove_wep_key(tstrWILC_WFIDrv *hWFIDrv, u8 u8keyIdx)
}
/* prepare the Remove Wep Key Message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_KEY;
@@ -4629,7 +4629,7 @@ s32 host_int_remove_wep_key(tstrWILC_WFIDrv *hWFIDrv, u8 u8keyIdx)
uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx = u8keyIdx;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("Error in sending message queue : Request to remove WEP key\n");
down(&(pstrWFIDrv->hSemTestKeyBlock));
@@ -4653,7 +4653,7 @@ s32 host_int_set_WEPDefaultKeyID(tstrWILC_WFIDrv *hWFIDrv, u8 u8Index)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
if (pstrWFIDrv == NULL) {
@@ -4663,7 +4663,7 @@ s32 host_int_set_WEPDefaultKeyID(tstrWILC_WFIDrv *hWFIDrv, u8 u8Index)
}
/* prepare the Key Message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_KEY;
@@ -4676,7 +4676,7 @@ s32 host_int_set_WEPDefaultKeyID(tstrWILC_WFIDrv *hWFIDrv, u8 u8Index)
uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx = u8Index;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("Error in sending message queue : Default key index\n");
down(&(pstrWFIDrv->hSemTestKeyBlock));
@@ -4708,7 +4708,7 @@ s32 host_int_add_wep_key_bss_sta(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey,
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
if (pstrWFIDrv == NULL) {
s32Error = -EFAULT;
@@ -4717,7 +4717,7 @@ s32 host_int_add_wep_key_bss_sta(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey,
}
/* prepare the Key Message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_KEY;
@@ -4740,7 +4740,7 @@ s32 host_int_add_wep_key_bss_sta(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey,
uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx = u8Keyidx;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("Error in sending message queue :WEP Key\n");
down(&(pstrWFIDrv->hSemTestKeyBlock));
@@ -4770,7 +4770,7 @@ s32 host_int_add_wep_key_bss_ap(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, u
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
u8 i;
if (pstrWFIDrv == NULL) {
@@ -4780,7 +4780,7 @@ s32 host_int_add_wep_key_bss_ap(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, u
}
/* prepare the Key Message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
if (INFO) {
for (i = 0; i < u8WepKeylen; i++)
@@ -4812,7 +4812,7 @@ s32 host_int_add_wep_key_bss_ap(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, u
strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwepAttr.tenuAuth_type = tenuAuth_type;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("Error in sending message queue :WEP Key\n");
@@ -4843,7 +4843,7 @@ s32 host_int_add_ptk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen,
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
u8 u8KeyLen = u8PtkKeylen;
u32 i;
@@ -4858,7 +4858,7 @@ s32 host_int_add_ptk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen,
u8KeyLen += TX_MIC_KEY_LEN;
/* prepare the Key Message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_KEY;
@@ -4908,7 +4908,7 @@ s32 host_int_add_ptk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen,
strHostIFmsg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("Error in sending message queue: PTK Key\n");
@@ -4939,7 +4939,7 @@ s32 host_int_add_rx_gtk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKe
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
u8 u8KeyLen = u8GtkKeylen;
if (pstrWFIDrv == NULL) {
@@ -4948,7 +4948,7 @@ s32 host_int_add_rx_gtk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKe
return s32Error;
}
/* prepare the Key Message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
if (pu8RxMic != NULL)
@@ -5006,7 +5006,7 @@ s32 host_int_add_rx_gtk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKe
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("Error in sending message queue: RX GTK\n");
/* ////////////// */
@@ -5040,7 +5040,7 @@ s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, tstrHostIFpmkidAttr *pu8Pm
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
u32 i;
@@ -5051,7 +5051,7 @@ s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, tstrHostIFpmkidAttr *pu8Pm
}
/* prepare the Key Message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_KEY;
strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = PMKSA;
@@ -5068,7 +5068,7 @@ s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, tstrHostIFpmkidAttr *pu8Pm
}
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER(" Error in sending messagequeue: PMKID Info\n");
@@ -5155,17 +5155,17 @@ s32 host_int_set_RSNAConfigPSKPassPhrase(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8PassPh
s32 host_int_get_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress)
{
s32 s32Error = 0;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
/* prepare the Message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_GET_MAC_ADDRESS;
strHostIFmsg.uniHostIFmsgBody.strHostIfGetMacAddress.u8MacAddress = pu8MacAddress;
strHostIFmsg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error) {
PRINT_ER("Failed to send get mac address\n");
return -EFAULT;
@@ -5189,17 +5189,17 @@ s32 host_int_get_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress)
s32 host_int_set_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress)
{
s32 s32Error = 0;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
PRINT_D(GENERIC_DBG, "mac addr = %x:%x:%x\n", pu8MacAddress[0], pu8MacAddress[1], pu8MacAddress[2]);
/* prepare setting mac address message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_SET_MAC_ADDRESS;
memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIfSetMacAddress.u8MacAddress, pu8MacAddress, ETH_ALEN);
strHostIFmsg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("Failed to send message queue: Set mac address\n");
@@ -5379,7 +5379,7 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid,
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
tenuScanConnTimer enuScanConnTimer;
if (pstrWFIDrv == NULL || pfConnectResult == NULL) {
@@ -5399,7 +5399,7 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid,
}
/* prepare the Connect Message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_CONNECT;
@@ -5437,7 +5437,7 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid,
PRINT_D(GENERIC_DBG, "Don't set state to 'connecting' as state is %d\n", pstrWFIDrv->enuHostIFstate);
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error) {
PRINT_ER("Failed to send message queue: Set join request\n");
return -EFAULT;
@@ -5466,7 +5466,7 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid,
s32 host_int_flush_join_req(tstrWILC_WFIDrv *hWFIDrv)
{
s32 s32Error = 0;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
if (!gu8FlushedJoinReq) {
s32Error = -EFAULT;
@@ -5484,7 +5484,7 @@ s32 host_int_flush_join_req(tstrWILC_WFIDrv *hWFIDrv)
strHostIFmsg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error) {
PRINT_ER("Failed to send message queue: Flush join request\n");
return -EFAULT;
@@ -5507,7 +5507,7 @@ s32 host_int_flush_join_req(tstrWILC_WFIDrv *hWFIDrv)
s32 host_int_disconnect(tstrWILC_WFIDrv *hWFIDrv, u16 u16ReasonCode)
{
s32 s32Error = 0;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
if (pstrWFIDrv == NULL) {
@@ -5516,13 +5516,13 @@ s32 host_int_disconnect(tstrWILC_WFIDrv *hWFIDrv, u16 u16ReasonCode)
}
/* prepare the Disconnect Message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_DISCONNECT;
strHostIFmsg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("Failed to send message queue: disconnect\n");
/* ////////////// */
@@ -5692,7 +5692,7 @@ s32 host_int_set_mac_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 u8ChNum)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -5700,12 +5700,12 @@ s32 host_int_set_mac_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 u8ChNum)
}
/* prepare the set channel message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_SET_CHANNEL;
strHostIFmsg.uniHostIFmsgBody.strHostIFSetChan.u8SetChan = u8ChNum;
strHostIFmsg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error) {
PRINT_ER("wilc mq send fail\n");
s32Error = -EINVAL;
@@ -5719,13 +5719,13 @@ s32 host_int_wait_msg_queue_idle(void)
{
s32 s32Error = 0;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
/* prepare the set driver handler message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_Q_IDLE;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error) {
PRINT_ER("wilc mq send fail\n");
s32Error = -EINVAL;
@@ -5742,17 +5742,17 @@ s32 host_int_set_wfi_drv_handler(tstrWILC_WFIDrv *u32address)
{
s32 s32Error = 0;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
/* prepare the set driver handler message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_SET_WFIDRV_HANDLER;
strHostIFmsg.uniHostIFmsgBody.strHostIfSetDrvHandler.u32Address = get_id_from_handler(u32address);
strHostIFmsg.drvHandler = u32address;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error) {
PRINT_ER("wilc mq send fail\n");
s32Error = -EINVAL;
@@ -5767,17 +5767,17 @@ s32 host_int_set_operation_mode(tstrWILC_WFIDrv *hWFIDrv, u32 u32mode)
{
s32 s32Error = 0;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
/* prepare the set driver handler message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_SET_OPERATION_MODE;
strHostIFmsg.uniHostIFmsgBody.strHostIfSetOperationMode.u32Mode = u32mode;
strHostIFmsg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error) {
PRINT_ER("wilc mq send fail\n");
s32Error = -EINVAL;
@@ -5805,7 +5805,7 @@ s32 host_int_get_host_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ChNo)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -5813,13 +5813,13 @@ s32 host_int_get_host_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ChNo)
}
/* prepare the Get Channel Message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_GET_CHNL;
strHostIFmsg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("wilc mq send fail\n");
down(&(pstrWFIDrv->hSemGetCHNL));
@@ -5890,14 +5890,14 @@ s32 host_int_get_inactive_time(tstrWILC_WFIDrv *hWFIDrv, const u8 *mac, u32 *pu3
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIfStaInactiveT.mac,
@@ -5907,7 +5907,7 @@ s32 host_int_get_inactive_time(tstrWILC_WFIDrv *hWFIDrv, const u8 *mac, u32 *pu3
strHostIFmsg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("Failed to send get host channel param's message queue ");
@@ -5977,18 +5977,18 @@ s32 host_int_test_get_int_wid(tstrWILC_WFIDrv *hWFIDrv, u32 *pu32TestMemAddr)
s32 host_int_get_rssi(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8Rssi)
{
s32 s32Error = 0;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
/* prepare the Get RSSI Message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_GET_RSSI;
strHostIFmsg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error) {
PRINT_ER("Failed to send get host channel param's message queue ");
return -EFAULT;
@@ -6011,7 +6011,7 @@ s32 host_int_get_rssi(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8Rssi)
s32 host_int_get_link_speed(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8lnkspd)
{
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -6019,13 +6019,13 @@ s32 host_int_get_link_speed(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8lnkspd)
/* prepare the Get LINKSPEED Message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_GET_LINKSPEED;
strHostIFmsg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error) {
PRINT_ER("Failed to send GET_LINKSPEED to message queue ");
return -EFAULT;
@@ -6049,17 +6049,17 @@ s32 host_int_get_link_speed(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8lnkspd)
s32 host_int_get_statistics(tstrWILC_WFIDrv *hWFIDrv, tstrStatistics *pstrStatistics)
{
s32 s32Error = 0;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
/* prepare the Get RSSI Message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_GET_STATISTICS;
strHostIFmsg.uniHostIFmsgBody.pUserData = (char *)pstrStatistics;
strHostIFmsg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error) {
PRINT_ER("Failed to send get host channel param's message queue ");
return -EFAULT;
@@ -6094,7 +6094,7 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource,
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
tenuScanConnTimer enuScanConnTimer;
if (pstrWFIDrv == NULL || ScanResult == NULL) {
@@ -6103,7 +6103,7 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource,
}
/* prepare the Scan Message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_SCAN;
@@ -6131,7 +6131,7 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource,
pu8IEs, IEsLen);
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error) {
PRINT_ER("Error in sending message queue\n");
return -EINVAL;
@@ -6163,7 +6163,7 @@ s32 hif_set_cfg(tstrWILC_WFIDrv *hWFIDrv, tstrCfgParamVal *pstrCfgParamVal)
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
if (pstrWFIDrv == NULL) {
@@ -6171,12 +6171,12 @@ s32 hif_set_cfg(tstrWILC_WFIDrv *hWFIDrv, tstrCfgParamVal *pstrCfgParamVal)
return -EFAULT;
}
/* prepare the WiphyParams Message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_CFG_PARAMS;
strHostIFmsg.uniHostIFmsgBody.strHostIFCfgParamAttr.pstrCfgParamVal = *pstrCfgParamVal;
strHostIFmsg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
return s32Error;
@@ -6339,16 +6339,16 @@ static void GetPeriodicRSSI(unsigned long arg)
if (pstrWFIDrv->enuHostIFstate == HOST_IF_CONNECTED) {
s32 s32Error = 0;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
/* prepare the Get RSSI Message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_GET_RSSI;
strHostIFmsg.drvHandler = pstrWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error) {
PRINT_ER("Failed to send get host channel param's message queue ");
return;
@@ -6535,7 +6535,7 @@ _fail_:
s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv)
{
s32 s32Error = 0;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
int ret;
/*obtain driver handle*/
@@ -6598,7 +6598,7 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv)
gbScanWhileConnected = false;
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
if (clients_count == 1) {
if (del_timer_sync(&g_hPeriodicRSSI)) {
@@ -6609,7 +6609,7 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv)
strHostIFmsg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error != 0)
PRINT_ER("Error in sending deinit's message queue message function: Error(%d)\n", s32Error);
@@ -6655,7 +6655,7 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv)
void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length)
{
s32 s32Error = 0;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
int id;
tstrWILC_WFIDrv *pstrWFIDrv = NULL;
@@ -6671,7 +6671,7 @@ void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length)
}
/* prepare the Asynchronous Network Info message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_RCVD_NTWRK_INFO;
strHostIFmsg.drvHandler = pstrWFIDrv;
@@ -6682,7 +6682,7 @@ void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length)
pu8Buffer, u32Length);
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("Error in sending network info message queue message parameters: Error(%d)\n", s32Error);
}
@@ -6701,7 +6701,7 @@ void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length)
void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length)
{
s32 s32Error = 0;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
int id;
tstrWILC_WFIDrv *pstrWFIDrv = NULL;
@@ -6729,7 +6729,7 @@ void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length)
}
/* prepare the General Asynchronous Info message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_RCVD_GNRL_ASYNC_INFO;
@@ -6742,7 +6742,7 @@ void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length)
pu8Buffer, u32Length);
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("Error in sending message queue asynchronous message info: Error(%d)\n", s32Error);
@@ -6762,7 +6762,7 @@ void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length)
void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length)
{
s32 s32Error = 0;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
int id;
tstrWILC_WFIDrv *pstrWFIDrv = NULL;
@@ -6778,7 +6778,7 @@ void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length)
/*if there is an ongoing scan request*/
if (pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult) {
/* prepare theScan Done message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_RCVD_SCAN_COMPLETE;
strHostIFmsg.drvHandler = pstrWFIDrv;
@@ -6793,7 +6793,7 @@ void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length)
* pu8Buffer, u32Length); */
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("Error in sending message queue scan complete parameters: Error(%d)\n", s32Error);
}
@@ -6821,7 +6821,7 @@ s32 host_int_remain_on_channel(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID, u32 u
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -6829,7 +6829,7 @@ s32 host_int_remain_on_channel(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID, u32 u
}
/* prepare the remainonchan Message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
/* prepare the WiphyParams Message */
strHostIFmsg.u16MsgId = HOST_IF_MSG_REMAIN_ON_CHAN;
@@ -6841,7 +6841,7 @@ s32 host_int_remain_on_channel(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID, u32 u
strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID = u32SessionID;
strHostIFmsg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("wilc mq send fail\n");
@@ -6866,7 +6866,7 @@ s32 host_int_ListenStateExpired(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -6877,12 +6877,12 @@ s32 host_int_ListenStateExpired(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID)
del_timer(&pstrWFIDrv->hRemainOnChannel);
/* prepare the timer fire Message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_LISTEN_TIMER_FIRED;
strHostIFmsg.drvHandler = hWFIDrv;
strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID = u32SessionID;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("wilc mq send fail\n");
@@ -6901,14 +6901,14 @@ s32 host_int_frame_register(tstrWILC_WFIDrv *hWFIDrv, u16 u16FrameType, bool bRe
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
/* prepare the WiphyParams Message */
strHostIFmsg.u16MsgId = HOST_IF_MSG_REGISTER_FRAME;
@@ -6931,7 +6931,7 @@ s32 host_int_frame_register(tstrWILC_WFIDrv *hWFIDrv, u16 u16FrameType, bool bRe
strHostIFmsg.uniHostIFmsgBody.strHostIfRegisterFrame.bReg = bReg;
strHostIFmsg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("wilc mq send fail\n");
@@ -6958,7 +6958,7 @@ s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32 u32Interval,
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
tstrHostIFSetBeacon *pstrSetBeaconParam = &strHostIFmsg.uniHostIFmsgBody.strHostIFSetBeacon;
if (pstrWFIDrv == NULL) {
@@ -6966,7 +6966,7 @@ s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32 u32Interval,
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
PRINT_D(HOSTINF_DBG, "Setting adding beacon message queue params\n");
@@ -6997,7 +6997,7 @@ s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32 u32Interval,
pstrSetBeaconParam->pu8Tail = NULL;
}
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("wilc mq send fail\n");
@@ -7028,7 +7028,7 @@ s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -7040,7 +7040,7 @@ s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv)
strHostIFmsg.drvHandler = hWFIDrv;
PRINT_D(HOSTINF_DBG, "Setting deleting beacon message queue params\n");
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
@@ -7061,7 +7061,7 @@ s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSta
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
tstrWILC_AddStaParam *pstrAddStationMsg = &strHostIFmsg.uniHostIFmsgBody.strAddStaParam;
@@ -7070,7 +7070,7 @@ s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSta
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
PRINT_D(HOSTINF_DBG, "Setting adding station message queue params\n");
@@ -7091,7 +7091,7 @@ s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSta
}
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
return s32Error;
@@ -7110,7 +7110,7 @@ s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
tstrHostIFDelSta *pstrDelStationMsg = &strHostIFmsg.uniHostIFmsgBody.strDelStaParam;
if (pstrWFIDrv == NULL) {
@@ -7118,7 +7118,7 @@ s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr)
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
PRINT_D(HOSTINF_DBG, "Setting deleting station message queue params\n");
@@ -7134,7 +7134,7 @@ s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr)
else
memcpy(pstrDelStationMsg->au8MacAddr, pu8MacAddr, ETH_ALEN);
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
return s32Error;
@@ -7152,7 +7152,7 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN])
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
tstrHostIFDelAllSta *pstrDelAllStationMsg = &strHostIFmsg.uniHostIFmsgBody.strHostIFDelAllSta;
u8 au8Zero_Buff[ETH_ALEN] = {0};
u32 i;
@@ -7164,7 +7164,7 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN])
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
PRINT_D(HOSTINF_DBG, "Setting deauthenticating station message queue params\n");
@@ -7187,7 +7187,7 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN])
}
pstrDelAllStationMsg->u8Num_AssocSta = u8AssocNumb;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
@@ -7212,7 +7212,7 @@ s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSt
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
tstrWILC_AddStaParam *pstrAddStationMsg = &strHostIFmsg.uniHostIFmsgBody.strAddStaParam;
if (pstrWFIDrv == NULL) {
@@ -7222,7 +7222,7 @@ s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSt
PRINT_D(HOSTINF_DBG, "Setting editing station message queue params\n");
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
/* prepare the WiphyParams Message */
@@ -7240,7 +7240,7 @@ s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSt
pstrAddStationMsg->pu8Rates = rates;
}
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
@@ -7253,7 +7253,7 @@ s32 host_int_set_power_mgmt(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32Ti
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
tstrHostIfPowerMgmtParam *pstrPowerMgmtParam = &strHostIFmsg.uniHostIFmsgBody.strPowerMgmtparam;
PRINT_INFO(HOSTINF_DBG, "\n\n>> Setting PS to %d <<\n\n", bIsEnabled);
@@ -7265,7 +7265,7 @@ s32 host_int_set_power_mgmt(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32Ti
PRINT_D(HOSTINF_DBG, "Setting Power management message queue params\n");
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
/* prepare the WiphyParams Message */
@@ -7276,7 +7276,7 @@ s32 host_int_set_power_mgmt(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32Ti
pstrPowerMgmtParam->u32Timeout = u32Timeout;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
return s32Error;
@@ -7287,7 +7287,7 @@ s32 host_int_setup_multicast_filter(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
tstrHostIFSetMulti *pstrMulticastFilterParam = &strHostIFmsg.uniHostIFmsgBody.strHostIfSetMulti;
@@ -7298,7 +7298,7 @@ s32 host_int_setup_multicast_filter(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u
PRINT_D(HOSTINF_DBG, "Setting Multicast Filter params\n");
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
/* prepare the WiphyParams Message */
@@ -7308,7 +7308,7 @@ s32 host_int_setup_multicast_filter(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u
pstrMulticastFilterParam->bIsEnabled = bIsEnabled;
pstrMulticastFilterParam->u32count = u32count;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
return s32Error;
@@ -7554,7 +7554,7 @@ static int host_int_addBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TI
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
tstrHostIfBASessionInfo *pBASessionInfo = &strHostIFmsg.uniHostIFmsgBody.strHostIfBASessionInfo;
if (pstrWFIDrv == NULL) {
@@ -7562,7 +7562,7 @@ static int host_int_addBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TI
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
/* prepare the WiphyParams Message */
strHostIFmsg.u16MsgId = HOST_IF_MSG_ADD_BA_SESSION;
@@ -7573,7 +7573,7 @@ static int host_int_addBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TI
pBASessionInfo->u16SessionTimeout = SessionTimeout;
strHostIFmsg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
@@ -7585,7 +7585,7 @@ s32 host_int_delBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TID)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
tstrHostIfBASessionInfo *pBASessionInfo = &strHostIFmsg.uniHostIFmsgBody.strHostIfBASessionInfo;
if (pstrWFIDrv == NULL) {
@@ -7593,7 +7593,7 @@ s32 host_int_delBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TID)
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
/* prepare the WiphyParams Message */
strHostIFmsg.u16MsgId = HOST_IF_MSG_DEL_BA_SESSION;
@@ -7602,7 +7602,7 @@ s32 host_int_delBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TID)
pBASessionInfo->u8Ted = TID;
strHostIFmsg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
@@ -7616,7 +7616,7 @@ s32 host_int_del_All_Rx_BASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char T
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
tstrHostIfBASessionInfo *pBASessionInfo = &strHostIFmsg.uniHostIFmsgBody.strHostIfBASessionInfo;
if (pstrWFIDrv == NULL) {
@@ -7624,7 +7624,7 @@ s32 host_int_del_All_Rx_BASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char T
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
/* prepare the WiphyParams Message */
strHostIFmsg.u16MsgId = HOST_IF_MSG_DEL_ALL_RX_BA_SESSIONS;
@@ -7633,7 +7633,7 @@ s32 host_int_del_All_Rx_BASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char T
pBASessionInfo->u8Ted = TID;
strHostIFmsg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
@@ -7655,7 +7655,7 @@ s32 host_int_setup_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
/* TODO: Enable This feature on softap firmware */
return 0;
@@ -7665,7 +7665,7 @@ s32 host_int_setup_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx)
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
/* prepare the WiphyParams Message */
strHostIFmsg.u16MsgId = HOST_IF_MSG_SET_IPADDRESS;
@@ -7674,7 +7674,7 @@ s32 host_int_setup_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx)
strHostIFmsg.drvHandler = hWFIDrv;
strHostIFmsg.uniHostIFmsgBody.strHostIfSetIP.idx = idx;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
@@ -7695,14 +7695,14 @@ s32 host_int_get_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
/* prepare the WiphyParams Message */
strHostIFmsg.u16MsgId = HOST_IF_MSG_GET_IPADDRESS;
@@ -7711,7 +7711,7 @@ s32 host_int_get_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx)
strHostIFmsg.drvHandler = hWFIDrv;
strHostIFmsg.uniHostIFmsgBody.strHostIfSetIP.idx = idx;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 02/34] staging: wilc1000: remove typedef from the struct
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 03/34] staging: wilc1000: rename strHostIFmsg Tony Cho
` (31 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
The Linux kernel coding style does not recommend to use typedef for the
structure. This patch removes typedef from the host_if_msg structure.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 294 +++++++++++++++---------------
1 file changed, 147 insertions(+), 147 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index d272091..7ffec1b 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -450,7 +450,7 @@ typedef union _tuniHostIFmsgBody {
} tuniHostIFmsgBody;
/*!
- * @struct host_if_msg
+ * @struct struct host_if_msg
* @brief Host Interface message
* @details
* @todo
@@ -459,11 +459,11 @@ typedef union _tuniHostIFmsgBody {
* @date 25 March 2012
* @version 1.0
*/
-typedef struct _host_if_msg {
+struct host_if_msg {
u16 u16MsgId; /*!< Message ID */
tuniHostIFmsgBody uniHostIFmsgBody; /*!< Message body */
tstrWILC_WFIDrv *drvHandler;
-} host_if_msg;
+};
#ifdef CONNECT_DIRECT
typedef struct _tstrWidJoinReqExt {
@@ -3984,19 +3984,19 @@ _done_:
static void ListenTimerCB(unsigned long arg)
{
s32 s32Error = 0;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)arg;
/*Stopping remain-on-channel timer*/
del_timer(&pstrWFIDrv->hRemainOnChannel);
/* prepare the Timer Callback message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_LISTEN_TIMER_FIRED;
strHostIFmsg.drvHandler = pstrWFIDrv;
strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID = pstrWFIDrv->strHostIfRemainOnChan.u32ListenSessionID;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
}
@@ -4315,13 +4315,13 @@ static s32 Handle_DelAllRxBASessions(tstrWILC_WFIDrv *drvHandler, tstrHostIfBASe
static int hostIFthread(void *pvArg)
{
u32 u32Ret;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
tstrWILC_WFIDrv *pstrWFIDrv;
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
while (1) {
- wilc_mq_recv(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg), &u32Ret);
+ wilc_mq_recv(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg), &u32Ret);
pstrWFIDrv = (tstrWILC_WFIDrv *)strHostIFmsg.drvHandler;
if (strHostIFmsg.u16MsgId == HOST_IF_MSG_EXIT) {
PRINT_D(GENERIC_DBG, "THREAD: Exiting HostIfThread\n");
@@ -4333,13 +4333,13 @@ static int hostIFthread(void *pvArg)
if ((!g_wilc_initialized)) {
PRINT_D(GENERIC_DBG, "--WAIT--");
usleep_range(200 * 1000, 200 * 1000);
- wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
continue;
}
if (strHostIFmsg.u16MsgId == HOST_IF_MSG_CONNECT && pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult != NULL) {
PRINT_D(HOSTINF_DBG, "Requeue connect request till scan done received\n");
- wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
usleep_range(2 * 1000, 2 * 1000);
continue;
}
@@ -4533,29 +4533,29 @@ static int hostIFthread(void *pvArg)
static void TimerCB_Scan(unsigned long arg)
{
void *pvArg = (void *)arg;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
/* prepare the Timer Callback message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.drvHandler = pvArg;
strHostIFmsg.u16MsgId = HOST_IF_MSG_SCAN_TIMER_FIRED;
/* send the message */
- wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
}
static void TimerCB_Connect(unsigned long arg)
{
void *pvArg = (void *)arg;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
/* prepare the Timer Callback message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.drvHandler = pvArg;
strHostIFmsg.u16MsgId = HOST_IF_MSG_CONNECT_TIMER_FIRED;
/* send the message */
- wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
}
@@ -4605,7 +4605,7 @@ s32 host_int_remove_wep_key(tstrWILC_WFIDrv *hWFIDrv, u8 u8keyIdx)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
if (pstrWFIDrv == NULL) {
@@ -4615,7 +4615,7 @@ s32 host_int_remove_wep_key(tstrWILC_WFIDrv *hWFIDrv, u8 u8keyIdx)
}
/* prepare the Remove Wep Key Message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_KEY;
@@ -4629,7 +4629,7 @@ s32 host_int_remove_wep_key(tstrWILC_WFIDrv *hWFIDrv, u8 u8keyIdx)
uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx = u8keyIdx;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("Error in sending message queue : Request to remove WEP key\n");
down(&(pstrWFIDrv->hSemTestKeyBlock));
@@ -4653,7 +4653,7 @@ s32 host_int_set_WEPDefaultKeyID(tstrWILC_WFIDrv *hWFIDrv, u8 u8Index)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
if (pstrWFIDrv == NULL) {
@@ -4663,7 +4663,7 @@ s32 host_int_set_WEPDefaultKeyID(tstrWILC_WFIDrv *hWFIDrv, u8 u8Index)
}
/* prepare the Key Message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_KEY;
@@ -4676,7 +4676,7 @@ s32 host_int_set_WEPDefaultKeyID(tstrWILC_WFIDrv *hWFIDrv, u8 u8Index)
uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx = u8Index;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("Error in sending message queue : Default key index\n");
down(&(pstrWFIDrv->hSemTestKeyBlock));
@@ -4708,7 +4708,7 @@ s32 host_int_add_wep_key_bss_sta(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey,
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
if (pstrWFIDrv == NULL) {
s32Error = -EFAULT;
@@ -4717,7 +4717,7 @@ s32 host_int_add_wep_key_bss_sta(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey,
}
/* prepare the Key Message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_KEY;
@@ -4740,7 +4740,7 @@ s32 host_int_add_wep_key_bss_sta(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey,
uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx = u8Keyidx;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("Error in sending message queue :WEP Key\n");
down(&(pstrWFIDrv->hSemTestKeyBlock));
@@ -4770,7 +4770,7 @@ s32 host_int_add_wep_key_bss_ap(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, u
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
u8 i;
if (pstrWFIDrv == NULL) {
@@ -4780,7 +4780,7 @@ s32 host_int_add_wep_key_bss_ap(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, u
}
/* prepare the Key Message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
if (INFO) {
for (i = 0; i < u8WepKeylen; i++)
@@ -4812,7 +4812,7 @@ s32 host_int_add_wep_key_bss_ap(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, u
strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwepAttr.tenuAuth_type = tenuAuth_type;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("Error in sending message queue :WEP Key\n");
@@ -4843,7 +4843,7 @@ s32 host_int_add_ptk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen,
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
u8 u8KeyLen = u8PtkKeylen;
u32 i;
@@ -4858,7 +4858,7 @@ s32 host_int_add_ptk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen,
u8KeyLen += TX_MIC_KEY_LEN;
/* prepare the Key Message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_KEY;
@@ -4908,7 +4908,7 @@ s32 host_int_add_ptk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen,
strHostIFmsg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("Error in sending message queue: PTK Key\n");
@@ -4939,7 +4939,7 @@ s32 host_int_add_rx_gtk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKe
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
u8 u8KeyLen = u8GtkKeylen;
if (pstrWFIDrv == NULL) {
@@ -4948,7 +4948,7 @@ s32 host_int_add_rx_gtk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKe
return s32Error;
}
/* prepare the Key Message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
if (pu8RxMic != NULL)
@@ -5006,7 +5006,7 @@ s32 host_int_add_rx_gtk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKe
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("Error in sending message queue: RX GTK\n");
/* ////////////// */
@@ -5040,7 +5040,7 @@ s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, tstrHostIFpmkidAttr *pu8Pm
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
u32 i;
@@ -5051,7 +5051,7 @@ s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, tstrHostIFpmkidAttr *pu8Pm
}
/* prepare the Key Message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_KEY;
strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = PMKSA;
@@ -5068,7 +5068,7 @@ s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, tstrHostIFpmkidAttr *pu8Pm
}
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER(" Error in sending messagequeue: PMKID Info\n");
@@ -5155,17 +5155,17 @@ s32 host_int_set_RSNAConfigPSKPassPhrase(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8PassPh
s32 host_int_get_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress)
{
s32 s32Error = 0;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
/* prepare the Message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_GET_MAC_ADDRESS;
strHostIFmsg.uniHostIFmsgBody.strHostIfGetMacAddress.u8MacAddress = pu8MacAddress;
strHostIFmsg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("Failed to send get mac address\n");
return -EFAULT;
@@ -5189,17 +5189,17 @@ s32 host_int_get_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress)
s32 host_int_set_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress)
{
s32 s32Error = 0;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
PRINT_D(GENERIC_DBG, "mac addr = %x:%x:%x\n", pu8MacAddress[0], pu8MacAddress[1], pu8MacAddress[2]);
/* prepare setting mac address message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_SET_MAC_ADDRESS;
memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIfSetMacAddress.u8MacAddress, pu8MacAddress, ETH_ALEN);
strHostIFmsg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("Failed to send message queue: Set mac address\n");
@@ -5379,7 +5379,7 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid,
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
tenuScanConnTimer enuScanConnTimer;
if (pstrWFIDrv == NULL || pfConnectResult == NULL) {
@@ -5399,7 +5399,7 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid,
}
/* prepare the Connect Message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_CONNECT;
@@ -5437,7 +5437,7 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid,
PRINT_D(GENERIC_DBG, "Don't set state to 'connecting' as state is %d\n", pstrWFIDrv->enuHostIFstate);
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("Failed to send message queue: Set join request\n");
return -EFAULT;
@@ -5466,7 +5466,7 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid,
s32 host_int_flush_join_req(tstrWILC_WFIDrv *hWFIDrv)
{
s32 s32Error = 0;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
if (!gu8FlushedJoinReq) {
s32Error = -EFAULT;
@@ -5484,7 +5484,7 @@ s32 host_int_flush_join_req(tstrWILC_WFIDrv *hWFIDrv)
strHostIFmsg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("Failed to send message queue: Flush join request\n");
return -EFAULT;
@@ -5507,7 +5507,7 @@ s32 host_int_flush_join_req(tstrWILC_WFIDrv *hWFIDrv)
s32 host_int_disconnect(tstrWILC_WFIDrv *hWFIDrv, u16 u16ReasonCode)
{
s32 s32Error = 0;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
if (pstrWFIDrv == NULL) {
@@ -5516,13 +5516,13 @@ s32 host_int_disconnect(tstrWILC_WFIDrv *hWFIDrv, u16 u16ReasonCode)
}
/* prepare the Disconnect Message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_DISCONNECT;
strHostIFmsg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("Failed to send message queue: disconnect\n");
/* ////////////// */
@@ -5692,7 +5692,7 @@ s32 host_int_set_mac_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 u8ChNum)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -5700,12 +5700,12 @@ s32 host_int_set_mac_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 u8ChNum)
}
/* prepare the set channel message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_SET_CHANNEL;
strHostIFmsg.uniHostIFmsgBody.strHostIFSetChan.u8SetChan = u8ChNum;
strHostIFmsg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("wilc mq send fail\n");
s32Error = -EINVAL;
@@ -5719,13 +5719,13 @@ s32 host_int_wait_msg_queue_idle(void)
{
s32 s32Error = 0;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
/* prepare the set driver handler message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_Q_IDLE;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("wilc mq send fail\n");
s32Error = -EINVAL;
@@ -5742,17 +5742,17 @@ s32 host_int_set_wfi_drv_handler(tstrWILC_WFIDrv *u32address)
{
s32 s32Error = 0;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
/* prepare the set driver handler message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_SET_WFIDRV_HANDLER;
strHostIFmsg.uniHostIFmsgBody.strHostIfSetDrvHandler.u32Address = get_id_from_handler(u32address);
strHostIFmsg.drvHandler = u32address;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("wilc mq send fail\n");
s32Error = -EINVAL;
@@ -5767,17 +5767,17 @@ s32 host_int_set_operation_mode(tstrWILC_WFIDrv *hWFIDrv, u32 u32mode)
{
s32 s32Error = 0;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
/* prepare the set driver handler message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_SET_OPERATION_MODE;
strHostIFmsg.uniHostIFmsgBody.strHostIfSetOperationMode.u32Mode = u32mode;
strHostIFmsg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("wilc mq send fail\n");
s32Error = -EINVAL;
@@ -5805,7 +5805,7 @@ s32 host_int_get_host_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ChNo)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -5813,13 +5813,13 @@ s32 host_int_get_host_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ChNo)
}
/* prepare the Get Channel Message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_GET_CHNL;
strHostIFmsg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc mq send fail\n");
down(&(pstrWFIDrv->hSemGetCHNL));
@@ -5890,14 +5890,14 @@ s32 host_int_get_inactive_time(tstrWILC_WFIDrv *hWFIDrv, const u8 *mac, u32 *pu3
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIfStaInactiveT.mac,
@@ -5907,7 +5907,7 @@ s32 host_int_get_inactive_time(tstrWILC_WFIDrv *hWFIDrv, const u8 *mac, u32 *pu3
strHostIFmsg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("Failed to send get host channel param's message queue ");
@@ -5977,18 +5977,18 @@ s32 host_int_test_get_int_wid(tstrWILC_WFIDrv *hWFIDrv, u32 *pu32TestMemAddr)
s32 host_int_get_rssi(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8Rssi)
{
s32 s32Error = 0;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
/* prepare the Get RSSI Message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_GET_RSSI;
strHostIFmsg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("Failed to send get host channel param's message queue ");
return -EFAULT;
@@ -6011,7 +6011,7 @@ s32 host_int_get_rssi(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8Rssi)
s32 host_int_get_link_speed(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8lnkspd)
{
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -6019,13 +6019,13 @@ s32 host_int_get_link_speed(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8lnkspd)
/* prepare the Get LINKSPEED Message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_GET_LINKSPEED;
strHostIFmsg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("Failed to send GET_LINKSPEED to message queue ");
return -EFAULT;
@@ -6049,17 +6049,17 @@ s32 host_int_get_link_speed(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8lnkspd)
s32 host_int_get_statistics(tstrWILC_WFIDrv *hWFIDrv, tstrStatistics *pstrStatistics)
{
s32 s32Error = 0;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
/* prepare the Get RSSI Message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_GET_STATISTICS;
strHostIFmsg.uniHostIFmsgBody.pUserData = (char *)pstrStatistics;
strHostIFmsg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("Failed to send get host channel param's message queue ");
return -EFAULT;
@@ -6094,7 +6094,7 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource,
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
tenuScanConnTimer enuScanConnTimer;
if (pstrWFIDrv == NULL || ScanResult == NULL) {
@@ -6103,7 +6103,7 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource,
}
/* prepare the Scan Message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_SCAN;
@@ -6131,7 +6131,7 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource,
pu8IEs, IEsLen);
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("Error in sending message queue\n");
return -EINVAL;
@@ -6163,7 +6163,7 @@ s32 hif_set_cfg(tstrWILC_WFIDrv *hWFIDrv, tstrCfgParamVal *pstrCfgParamVal)
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
if (pstrWFIDrv == NULL) {
@@ -6171,12 +6171,12 @@ s32 hif_set_cfg(tstrWILC_WFIDrv *hWFIDrv, tstrCfgParamVal *pstrCfgParamVal)
return -EFAULT;
}
/* prepare the WiphyParams Message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_CFG_PARAMS;
strHostIFmsg.uniHostIFmsgBody.strHostIFCfgParamAttr.pstrCfgParamVal = *pstrCfgParamVal;
strHostIFmsg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
return s32Error;
@@ -6339,16 +6339,16 @@ static void GetPeriodicRSSI(unsigned long arg)
if (pstrWFIDrv->enuHostIFstate == HOST_IF_CONNECTED) {
s32 s32Error = 0;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
/* prepare the Get RSSI Message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_GET_RSSI;
strHostIFmsg.drvHandler = pstrWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("Failed to send get host channel param's message queue ");
return;
@@ -6535,7 +6535,7 @@ _fail_:
s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv)
{
s32 s32Error = 0;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
int ret;
/*obtain driver handle*/
@@ -6598,7 +6598,7 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv)
gbScanWhileConnected = false;
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
if (clients_count == 1) {
if (del_timer_sync(&g_hPeriodicRSSI)) {
@@ -6609,7 +6609,7 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv)
strHostIFmsg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error != 0)
PRINT_ER("Error in sending deinit's message queue message function: Error(%d)\n", s32Error);
@@ -6655,7 +6655,7 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv)
void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length)
{
s32 s32Error = 0;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
int id;
tstrWILC_WFIDrv *pstrWFIDrv = NULL;
@@ -6671,7 +6671,7 @@ void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length)
}
/* prepare the Asynchronous Network Info message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_RCVD_NTWRK_INFO;
strHostIFmsg.drvHandler = pstrWFIDrv;
@@ -6682,7 +6682,7 @@ void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length)
pu8Buffer, u32Length);
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("Error in sending network info message queue message parameters: Error(%d)\n", s32Error);
}
@@ -6701,7 +6701,7 @@ void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length)
void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length)
{
s32 s32Error = 0;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
int id;
tstrWILC_WFIDrv *pstrWFIDrv = NULL;
@@ -6729,7 +6729,7 @@ void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length)
}
/* prepare the General Asynchronous Info message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_RCVD_GNRL_ASYNC_INFO;
@@ -6742,7 +6742,7 @@ void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length)
pu8Buffer, u32Length);
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("Error in sending message queue asynchronous message info: Error(%d)\n", s32Error);
@@ -6762,7 +6762,7 @@ void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length)
void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length)
{
s32 s32Error = 0;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
int id;
tstrWILC_WFIDrv *pstrWFIDrv = NULL;
@@ -6778,7 +6778,7 @@ void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length)
/*if there is an ongoing scan request*/
if (pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult) {
/* prepare theScan Done message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_RCVD_SCAN_COMPLETE;
strHostIFmsg.drvHandler = pstrWFIDrv;
@@ -6793,7 +6793,7 @@ void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length)
* pu8Buffer, u32Length); */
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("Error in sending message queue scan complete parameters: Error(%d)\n", s32Error);
}
@@ -6821,7 +6821,7 @@ s32 host_int_remain_on_channel(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID, u32 u
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -6829,7 +6829,7 @@ s32 host_int_remain_on_channel(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID, u32 u
}
/* prepare the remainonchan Message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
strHostIFmsg.u16MsgId = HOST_IF_MSG_REMAIN_ON_CHAN;
@@ -6841,7 +6841,7 @@ s32 host_int_remain_on_channel(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID, u32 u
strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID = u32SessionID;
strHostIFmsg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc mq send fail\n");
@@ -6866,7 +6866,7 @@ s32 host_int_ListenStateExpired(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -6877,12 +6877,12 @@ s32 host_int_ListenStateExpired(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID)
del_timer(&pstrWFIDrv->hRemainOnChannel);
/* prepare the timer fire Message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_LISTEN_TIMER_FIRED;
strHostIFmsg.drvHandler = hWFIDrv;
strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID = u32SessionID;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc mq send fail\n");
@@ -6901,14 +6901,14 @@ s32 host_int_frame_register(tstrWILC_WFIDrv *hWFIDrv, u16 u16FrameType, bool bRe
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
strHostIFmsg.u16MsgId = HOST_IF_MSG_REGISTER_FRAME;
@@ -6931,7 +6931,7 @@ s32 host_int_frame_register(tstrWILC_WFIDrv *hWFIDrv, u16 u16FrameType, bool bRe
strHostIFmsg.uniHostIFmsgBody.strHostIfRegisterFrame.bReg = bReg;
strHostIFmsg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc mq send fail\n");
@@ -6958,7 +6958,7 @@ s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32 u32Interval,
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
tstrHostIFSetBeacon *pstrSetBeaconParam = &strHostIFmsg.uniHostIFmsgBody.strHostIFSetBeacon;
if (pstrWFIDrv == NULL) {
@@ -6966,7 +6966,7 @@ s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32 u32Interval,
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
PRINT_D(HOSTINF_DBG, "Setting adding beacon message queue params\n");
@@ -6997,7 +6997,7 @@ s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32 u32Interval,
pstrSetBeaconParam->pu8Tail = NULL;
}
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc mq send fail\n");
@@ -7028,7 +7028,7 @@ s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -7040,7 +7040,7 @@ s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv)
strHostIFmsg.drvHandler = hWFIDrv;
PRINT_D(HOSTINF_DBG, "Setting deleting beacon message queue params\n");
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
@@ -7061,7 +7061,7 @@ s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSta
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
tstrWILC_AddStaParam *pstrAddStationMsg = &strHostIFmsg.uniHostIFmsgBody.strAddStaParam;
@@ -7070,7 +7070,7 @@ s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSta
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
PRINT_D(HOSTINF_DBG, "Setting adding station message queue params\n");
@@ -7091,7 +7091,7 @@ s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSta
}
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
return s32Error;
@@ -7110,7 +7110,7 @@ s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
tstrHostIFDelSta *pstrDelStationMsg = &strHostIFmsg.uniHostIFmsgBody.strDelStaParam;
if (pstrWFIDrv == NULL) {
@@ -7118,7 +7118,7 @@ s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr)
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
PRINT_D(HOSTINF_DBG, "Setting deleting station message queue params\n");
@@ -7134,7 +7134,7 @@ s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr)
else
memcpy(pstrDelStationMsg->au8MacAddr, pu8MacAddr, ETH_ALEN);
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
return s32Error;
@@ -7152,7 +7152,7 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN])
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
tstrHostIFDelAllSta *pstrDelAllStationMsg = &strHostIFmsg.uniHostIFmsgBody.strHostIFDelAllSta;
u8 au8Zero_Buff[ETH_ALEN] = {0};
u32 i;
@@ -7164,7 +7164,7 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN])
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
PRINT_D(HOSTINF_DBG, "Setting deauthenticating station message queue params\n");
@@ -7187,7 +7187,7 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN])
}
pstrDelAllStationMsg->u8Num_AssocSta = u8AssocNumb;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
@@ -7212,7 +7212,7 @@ s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSt
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
tstrWILC_AddStaParam *pstrAddStationMsg = &strHostIFmsg.uniHostIFmsgBody.strAddStaParam;
if (pstrWFIDrv == NULL) {
@@ -7222,7 +7222,7 @@ s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSt
PRINT_D(HOSTINF_DBG, "Setting editing station message queue params\n");
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
@@ -7240,7 +7240,7 @@ s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSt
pstrAddStationMsg->pu8Rates = rates;
}
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
@@ -7253,7 +7253,7 @@ s32 host_int_set_power_mgmt(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32Ti
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
tstrHostIfPowerMgmtParam *pstrPowerMgmtParam = &strHostIFmsg.uniHostIFmsgBody.strPowerMgmtparam;
PRINT_INFO(HOSTINF_DBG, "\n\n>> Setting PS to %d <<\n\n", bIsEnabled);
@@ -7265,7 +7265,7 @@ s32 host_int_set_power_mgmt(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32Ti
PRINT_D(HOSTINF_DBG, "Setting Power management message queue params\n");
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
@@ -7276,7 +7276,7 @@ s32 host_int_set_power_mgmt(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32Ti
pstrPowerMgmtParam->u32Timeout = u32Timeout;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
return s32Error;
@@ -7287,7 +7287,7 @@ s32 host_int_setup_multicast_filter(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
tstrHostIFSetMulti *pstrMulticastFilterParam = &strHostIFmsg.uniHostIFmsgBody.strHostIfSetMulti;
@@ -7298,7 +7298,7 @@ s32 host_int_setup_multicast_filter(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u
PRINT_D(HOSTINF_DBG, "Setting Multicast Filter params\n");
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
@@ -7308,7 +7308,7 @@ s32 host_int_setup_multicast_filter(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u
pstrMulticastFilterParam->bIsEnabled = bIsEnabled;
pstrMulticastFilterParam->u32count = u32count;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
return s32Error;
@@ -7554,7 +7554,7 @@ static int host_int_addBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TI
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
tstrHostIfBASessionInfo *pBASessionInfo = &strHostIFmsg.uniHostIFmsgBody.strHostIfBASessionInfo;
if (pstrWFIDrv == NULL) {
@@ -7562,7 +7562,7 @@ static int host_int_addBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TI
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
strHostIFmsg.u16MsgId = HOST_IF_MSG_ADD_BA_SESSION;
@@ -7573,7 +7573,7 @@ static int host_int_addBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TI
pBASessionInfo->u16SessionTimeout = SessionTimeout;
strHostIFmsg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
@@ -7585,7 +7585,7 @@ s32 host_int_delBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TID)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
tstrHostIfBASessionInfo *pBASessionInfo = &strHostIFmsg.uniHostIFmsgBody.strHostIfBASessionInfo;
if (pstrWFIDrv == NULL) {
@@ -7593,7 +7593,7 @@ s32 host_int_delBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TID)
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
strHostIFmsg.u16MsgId = HOST_IF_MSG_DEL_BA_SESSION;
@@ -7602,7 +7602,7 @@ s32 host_int_delBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TID)
pBASessionInfo->u8Ted = TID;
strHostIFmsg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
@@ -7616,7 +7616,7 @@ s32 host_int_del_All_Rx_BASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char T
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
tstrHostIfBASessionInfo *pBASessionInfo = &strHostIFmsg.uniHostIFmsgBody.strHostIfBASessionInfo;
if (pstrWFIDrv == NULL) {
@@ -7624,7 +7624,7 @@ s32 host_int_del_All_Rx_BASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char T
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
strHostIFmsg.u16MsgId = HOST_IF_MSG_DEL_ALL_RX_BA_SESSIONS;
@@ -7633,7 +7633,7 @@ s32 host_int_del_All_Rx_BASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char T
pBASessionInfo->u8Ted = TID;
strHostIFmsg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
@@ -7655,7 +7655,7 @@ s32 host_int_setup_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
/* TODO: Enable This feature on softap firmware */
return 0;
@@ -7665,7 +7665,7 @@ s32 host_int_setup_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx)
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
strHostIFmsg.u16MsgId = HOST_IF_MSG_SET_IPADDRESS;
@@ -7674,7 +7674,7 @@ s32 host_int_setup_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx)
strHostIFmsg.drvHandler = hWFIDrv;
strHostIFmsg.uniHostIFmsgBody.strHostIfSetIP.idx = idx;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
@@ -7695,14 +7695,14 @@ s32 host_int_get_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
strHostIFmsg.u16MsgId = HOST_IF_MSG_GET_IPADDRESS;
@@ -7711,7 +7711,7 @@ s32 host_int_get_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx)
strHostIFmsg.drvHandler = hWFIDrv;
strHostIFmsg.uniHostIFmsgBody.strHostIfSetIP.idx = idx;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 03/34] staging: wilc1000: rename strHostIFmsg
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
2015-09-18 9:11 ` [PATCH 02/34] staging: wilc1000: remove typedef from the struct Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-19 3:00 ` Greg KH
2015-09-18 9:11 ` [PATCH 04/34] staging: wilc1000: rename u16MsgId Tony Cho
` (30 subsequent siblings)
32 siblings, 1 reply; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch changes the name, strHostIFmsg simply to msg because the
camelcase notation is not recommended in Linux.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 794 +++++++++++++++---------------
1 file changed, 397 insertions(+), 397 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 7ffec1b..e03ca8f 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3984,19 +3984,19 @@ _done_:
static void ListenTimerCB(unsigned long arg)
{
s32 s32Error = 0;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)arg;
/*Stopping remain-on-channel timer*/
del_timer(&pstrWFIDrv->hRemainOnChannel);
/* prepare the Timer Callback message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_LISTEN_TIMER_FIRED;
- strHostIFmsg.drvHandler = pstrWFIDrv;
- strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID = pstrWFIDrv->strHostIfRemainOnChan.u32ListenSessionID;
+ memset(&msg, 0, sizeof(struct host_if_msg));
+ msg.u16MsgId = HOST_IF_MSG_LISTEN_TIMER_FIRED;
+ msg.drvHandler = pstrWFIDrv;
+ msg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID = pstrWFIDrv->strHostIfRemainOnChan.u32ListenSessionID;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
}
@@ -4315,15 +4315,15 @@ static s32 Handle_DelAllRxBASessions(tstrWILC_WFIDrv *drvHandler, tstrHostIfBASe
static int hostIFthread(void *pvArg)
{
u32 u32Ret;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
tstrWILC_WFIDrv *pstrWFIDrv;
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
while (1) {
- wilc_mq_recv(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg), &u32Ret);
- pstrWFIDrv = (tstrWILC_WFIDrv *)strHostIFmsg.drvHandler;
- if (strHostIFmsg.u16MsgId == HOST_IF_MSG_EXIT) {
+ wilc_mq_recv(&gMsgQHostIF, &msg, sizeof(struct host_if_msg), &u32Ret);
+ pstrWFIDrv = (tstrWILC_WFIDrv *)msg.drvHandler;
+ if (msg.u16MsgId == HOST_IF_MSG_EXIT) {
PRINT_D(GENERIC_DBG, "THREAD: Exiting HostIfThread\n");
break;
}
@@ -4333,58 +4333,58 @@ static int hostIFthread(void *pvArg)
if ((!g_wilc_initialized)) {
PRINT_D(GENERIC_DBG, "--WAIT--");
usleep_range(200 * 1000, 200 * 1000);
- wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
continue;
}
- if (strHostIFmsg.u16MsgId == HOST_IF_MSG_CONNECT && pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult != NULL) {
+ if (msg.u16MsgId == HOST_IF_MSG_CONNECT && pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult != NULL) {
PRINT_D(HOSTINF_DBG, "Requeue connect request till scan done received\n");
- wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
usleep_range(2 * 1000, 2 * 1000);
continue;
}
- switch (strHostIFmsg.u16MsgId) {
+ switch (msg.u16MsgId) {
case HOST_IF_MSG_Q_IDLE:
Handle_wait_msg_q_empty();
break;
case HOST_IF_MSG_SCAN:
- Handle_Scan(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIFscanAttr);
+ Handle_Scan(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIFscanAttr);
break;
case HOST_IF_MSG_CONNECT:
- Handle_Connect(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr);
+ Handle_Connect(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIFconnectAttr);
break;
/*BugID_5137*/
case HOST_IF_MSG_FLUSH_CONNECT:
- Handle_FlushConnect(strHostIFmsg.drvHandler);
+ Handle_FlushConnect(msg.drvHandler);
break;
case HOST_IF_MSG_RCVD_NTWRK_INFO:
- Handle_RcvdNtwrkInfo(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strRcvdNetworkInfo);
+ Handle_RcvdNtwrkInfo(msg.drvHandler, &msg.uniHostIFmsgBody.strRcvdNetworkInfo);
break;
case HOST_IF_MSG_RCVD_GNRL_ASYNC_INFO:
- Handle_RcvdGnrlAsyncInfo(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strRcvdGnrlAsyncInfo);
+ Handle_RcvdGnrlAsyncInfo(msg.drvHandler, &msg.uniHostIFmsgBody.strRcvdGnrlAsyncInfo);
break;
case HOST_IF_MSG_KEY:
- Handle_Key(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr);
+ Handle_Key(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIFkeyAttr);
break;
case HOST_IF_MSG_CFG_PARAMS:
- Handle_CfgParam(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIFCfgParamAttr);
+ Handle_CfgParam(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIFCfgParamAttr);
break;
case HOST_IF_MSG_SET_CHANNEL:
- Handle_SetChannel(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIFSetChan);
+ Handle_SetChannel(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIFSetChan);
break;
case HOST_IF_MSG_DISCONNECT:
- Handle_Disconnect(strHostIFmsg.drvHandler);
+ Handle_Disconnect(msg.drvHandler);
break;
case HOST_IF_MSG_RCVD_SCAN_COMPLETE:
@@ -4396,127 +4396,127 @@ static int hostIFthread(void *pvArg)
if (!linux_wlan_get_num_conn_ifcs())
chip_sleep_manually(INFINITE_SLEEP_TIME);
- Handle_ScanDone(strHostIFmsg.drvHandler, SCAN_EVENT_DONE);
+ Handle_ScanDone(msg.drvHandler, SCAN_EVENT_DONE);
if (pstrWFIDrv->u8RemainOnChan_pendingreq)
- Handle_RemainOnChan(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan);
+ Handle_RemainOnChan(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIfRemainOnChan);
break;
case HOST_IF_MSG_GET_RSSI:
- Handle_GetRssi(strHostIFmsg.drvHandler);
+ Handle_GetRssi(msg.drvHandler);
break;
case HOST_IF_MSG_GET_LINKSPEED:
- Handle_GetLinkspeed(strHostIFmsg.drvHandler);
+ Handle_GetLinkspeed(msg.drvHandler);
break;
case HOST_IF_MSG_GET_STATISTICS:
- Handle_GetStatistics(strHostIFmsg.drvHandler, (tstrStatistics *)strHostIFmsg.uniHostIFmsgBody.pUserData);
+ Handle_GetStatistics(msg.drvHandler, (tstrStatistics *)msg.uniHostIFmsgBody.pUserData);
break;
case HOST_IF_MSG_GET_CHNL:
- Handle_GetChnl(strHostIFmsg.drvHandler);
+ Handle_GetChnl(msg.drvHandler);
break;
case HOST_IF_MSG_ADD_BEACON:
- Handle_AddBeacon(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIFSetBeacon);
+ Handle_AddBeacon(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIFSetBeacon);
break;
case HOST_IF_MSG_DEL_BEACON:
- Handle_DelBeacon(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIFDelBeacon);
+ Handle_DelBeacon(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIFDelBeacon);
break;
case HOST_IF_MSG_ADD_STATION:
- Handle_AddStation(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strAddStaParam);
+ Handle_AddStation(msg.drvHandler, &msg.uniHostIFmsgBody.strAddStaParam);
break;
case HOST_IF_MSG_DEL_STATION:
- Handle_DelStation(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strDelStaParam);
+ Handle_DelStation(msg.drvHandler, &msg.uniHostIFmsgBody.strDelStaParam);
break;
case HOST_IF_MSG_EDIT_STATION:
- Handle_EditStation(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strEditStaParam);
+ Handle_EditStation(msg.drvHandler, &msg.uniHostIFmsgBody.strEditStaParam);
break;
case HOST_IF_MSG_GET_INACTIVETIME:
- Handle_Get_InActiveTime(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIfStaInactiveT);
+ Handle_Get_InActiveTime(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIfStaInactiveT);
break;
case HOST_IF_MSG_SCAN_TIMER_FIRED:
PRINT_D(HOSTINF_DBG, "Scan Timeout\n");
- Handle_ScanDone(strHostIFmsg.drvHandler, SCAN_EVENT_ABORTED);
+ Handle_ScanDone(msg.drvHandler, SCAN_EVENT_ABORTED);
break;
case HOST_IF_MSG_CONNECT_TIMER_FIRED:
PRINT_D(HOSTINF_DBG, "Connect Timeout\n");
- Handle_ConnectTimeout(strHostIFmsg.drvHandler);
+ Handle_ConnectTimeout(msg.drvHandler);
break;
case HOST_IF_MSG_POWER_MGMT:
- Handle_PowerManagement(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strPowerMgmtparam);
+ Handle_PowerManagement(msg.drvHandler, &msg.uniHostIFmsgBody.strPowerMgmtparam);
break;
case HOST_IF_MSG_SET_WFIDRV_HANDLER:
- Handle_SetWfiDrvHandler(strHostIFmsg.drvHandler,
- &strHostIFmsg.uniHostIFmsgBody.strHostIfSetDrvHandler);
+ Handle_SetWfiDrvHandler(msg.drvHandler,
+ &msg.uniHostIFmsgBody.strHostIfSetDrvHandler);
break;
case HOST_IF_MSG_SET_OPERATION_MODE:
- Handle_SetOperationMode(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIfSetOperationMode);
+ Handle_SetOperationMode(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIfSetOperationMode);
break;
case HOST_IF_MSG_SET_IPADDRESS:
PRINT_D(HOSTINF_DBG, "HOST_IF_MSG_SET_IPADDRESS\n");
- Handle_set_IPAddress(strHostIFmsg.drvHandler, strHostIFmsg.uniHostIFmsgBody.strHostIfSetIP.au8IPAddr, strHostIFmsg.uniHostIFmsgBody.strHostIfSetIP.idx);
+ Handle_set_IPAddress(msg.drvHandler, msg.uniHostIFmsgBody.strHostIfSetIP.au8IPAddr, msg.uniHostIFmsgBody.strHostIfSetIP.idx);
break;
case HOST_IF_MSG_GET_IPADDRESS:
PRINT_D(HOSTINF_DBG, "HOST_IF_MSG_SET_IPADDRESS\n");
- Handle_get_IPAddress(strHostIFmsg.drvHandler, strHostIFmsg.uniHostIFmsgBody.strHostIfSetIP.au8IPAddr, strHostIFmsg.uniHostIFmsgBody.strHostIfSetIP.idx);
+ Handle_get_IPAddress(msg.drvHandler, msg.uniHostIFmsgBody.strHostIfSetIP.au8IPAddr, msg.uniHostIFmsgBody.strHostIfSetIP.idx);
break;
/*BugID_5077*/
case HOST_IF_MSG_SET_MAC_ADDRESS:
- Handle_SetMacAddress(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIfSetMacAddress);
+ Handle_SetMacAddress(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIfSetMacAddress);
break;
/*BugID_5213*/
case HOST_IF_MSG_GET_MAC_ADDRESS:
- Handle_GetMacAddress(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIfGetMacAddress);
+ Handle_GetMacAddress(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIfGetMacAddress);
break;
case HOST_IF_MSG_REMAIN_ON_CHAN:
PRINT_D(HOSTINF_DBG, "HOST_IF_MSG_REMAIN_ON_CHAN\n");
- Handle_RemainOnChan(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan);
+ Handle_RemainOnChan(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIfRemainOnChan);
break;
case HOST_IF_MSG_REGISTER_FRAME:
PRINT_D(HOSTINF_DBG, "HOST_IF_MSG_REGISTER_FRAME\n");
- Handle_RegisterFrame(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIfRegisterFrame);
+ Handle_RegisterFrame(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIfRegisterFrame);
break;
case HOST_IF_MSG_LISTEN_TIMER_FIRED:
- Handle_ListenStateExpired(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan);
+ Handle_ListenStateExpired(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIfRemainOnChan);
break;
case HOST_IF_MSG_SET_MULTICAST_FILTER:
PRINT_D(HOSTINF_DBG, "HOST_IF_MSG_SET_MULTICAST_FILTER\n");
- Handle_SetMulticastFilter(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIfSetMulti);
+ Handle_SetMulticastFilter(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIfSetMulti);
break;
/*BugID_5222*/
case HOST_IF_MSG_ADD_BA_SESSION:
- Handle_AddBASession(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIfBASessionInfo);
+ Handle_AddBASession(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIfBASessionInfo);
break;
case HOST_IF_MSG_DEL_ALL_RX_BA_SESSIONS:
- Handle_DelAllRxBASessions(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIfBASessionInfo);
+ Handle_DelAllRxBASessions(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIfBASessionInfo);
break;
case HOST_IF_MSG_DEL_ALL_STA:
- Handle_DelAllSta(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIFDelAllSta);
+ Handle_DelAllSta(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIFDelAllSta);
break;
default:
@@ -4533,29 +4533,29 @@ static int hostIFthread(void *pvArg)
static void TimerCB_Scan(unsigned long arg)
{
void *pvArg = (void *)arg;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
/* prepare the Timer Callback message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.drvHandler = pvArg;
- strHostIFmsg.u16MsgId = HOST_IF_MSG_SCAN_TIMER_FIRED;
+ memset(&msg, 0, sizeof(struct host_if_msg));
+ msg.drvHandler = pvArg;
+ msg.u16MsgId = HOST_IF_MSG_SCAN_TIMER_FIRED;
/* send the message */
- wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
}
static void TimerCB_Connect(unsigned long arg)
{
void *pvArg = (void *)arg;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
/* prepare the Timer Callback message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.drvHandler = pvArg;
- strHostIFmsg.u16MsgId = HOST_IF_MSG_CONNECT_TIMER_FIRED;
+ memset(&msg, 0, sizeof(struct host_if_msg));
+ msg.drvHandler = pvArg;
+ msg.u16MsgId = HOST_IF_MSG_CONNECT_TIMER_FIRED;
/* send the message */
- wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
}
@@ -4605,7 +4605,7 @@ s32 host_int_remove_wep_key(tstrWILC_WFIDrv *hWFIDrv, u8 u8keyIdx)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
if (pstrWFIDrv == NULL) {
@@ -4615,21 +4615,21 @@ s32 host_int_remove_wep_key(tstrWILC_WFIDrv *hWFIDrv, u8 u8keyIdx)
}
/* prepare the Remove Wep Key Message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_KEY;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WEP;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = REMOVEKEY;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_KEY;
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WEP;
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = REMOVEKEY;
+ msg.drvHandler = hWFIDrv;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx = u8keyIdx;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("Error in sending message queue : Request to remove WEP key\n");
down(&(pstrWFIDrv->hSemTestKeyBlock));
@@ -4653,7 +4653,7 @@ s32 host_int_set_WEPDefaultKeyID(tstrWILC_WFIDrv *hWFIDrv, u8 u8Index)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
if (pstrWFIDrv == NULL) {
@@ -4663,20 +4663,20 @@ s32 host_int_set_WEPDefaultKeyID(tstrWILC_WFIDrv *hWFIDrv, u8 u8Index)
}
/* prepare the Key Message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_KEY;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WEP;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = DEFAULTKEY;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_KEY;
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WEP;
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = DEFAULTKEY;
+ msg.drvHandler = hWFIDrv;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx = u8Index;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("Error in sending message queue : Default key index\n");
down(&(pstrWFIDrv->hSemTestKeyBlock));
@@ -4708,7 +4708,7 @@ s32 host_int_add_wep_key_bss_sta(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey,
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
if (pstrWFIDrv == NULL) {
s32Error = -EFAULT;
@@ -4717,30 +4717,30 @@ s32 host_int_add_wep_key_bss_sta(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey,
}
/* prepare the Key Message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_KEY;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WEP;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_KEY;
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WEP;
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY;
+ msg.drvHandler = hWFIDrv;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey = kmalloc(u8WepKeylen, GFP_KERNEL);
- memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey,
+ memcpy(msg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey,
pu8WepKey, u8WepKeylen);
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwepAttr.u8WepKeylen = (u8WepKeylen);
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx = u8Keyidx;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("Error in sending message queue :WEP Key\n");
down(&(pstrWFIDrv->hSemTestKeyBlock));
@@ -4770,7 +4770,7 @@ s32 host_int_add_wep_key_bss_ap(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, u
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
u8 i;
if (pstrWFIDrv == NULL) {
@@ -4780,39 +4780,39 @@ s32 host_int_add_wep_key_bss_ap(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, u
}
/* prepare the Key Message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
if (INFO) {
for (i = 0; i < u8WepKeylen; i++)
PRINT_INFO(HOSTAPD_DBG, "KEY is %x\n", pu8WepKey[i]);
}
- strHostIFmsg.u16MsgId = HOST_IF_MSG_KEY;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WEP;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY_AP;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_KEY;
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WEP;
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY_AP;
+ msg.drvHandler = hWFIDrv;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey = kmalloc(u8WepKeylen, GFP_KERNEL);
- memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey,
+ memcpy(msg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey,
pu8WepKey, (u8WepKeylen));
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwepAttr.u8WepKeylen = (u8WepKeylen);
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx = u8Keyidx;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwepAttr.u8mode = u8mode;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwepAttr.tenuAuth_type = tenuAuth_type;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("Error in sending message queue :WEP Key\n");
@@ -4843,7 +4843,7 @@ s32 host_int_add_ptk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen,
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
u8 u8KeyLen = u8PtkKeylen;
u32 i;
@@ -4858,30 +4858,30 @@ s32 host_int_add_ptk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen,
u8KeyLen += TX_MIC_KEY_LEN;
/* prepare the Key Message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_KEY;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WPAPtk;
+ msg.u16MsgId = HOST_IF_MSG_KEY;
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WPAPtk;
if (mode == AP_MODE) {
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY_AP;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY_AP;
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwpaAttr.u8keyidx = u8Idx;
}
if (mode == STATION_MODE)
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY;
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwpaAttr.pu8key = kmalloc(u8PtkKeylen, GFP_KERNEL);
- memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key,
+ memcpy(msg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key,
pu8Ptk, u8PtkKeylen);
if (pu8RxMic != NULL) {
- memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key + 16,
+ memcpy(msg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key + 16,
pu8RxMic, RX_MIC_KEY_LEN);
if (INFO) {
for (i = 0; i < RX_MIC_KEY_LEN; i++)
@@ -4890,7 +4890,7 @@ s32 host_int_add_ptk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen,
}
if (pu8TxMic != NULL) {
- memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key + 24,
+ memcpy(msg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key + 24,
pu8TxMic, TX_MIC_KEY_LEN);
if (INFO) {
for (i = 0; i < TX_MIC_KEY_LEN; i++)
@@ -4898,17 +4898,17 @@ s32 host_int_add_ptk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen,
}
}
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwpaAttr.u8Keylen = u8KeyLen;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwpaAttr.u8Ciphermode = u8Ciphermode;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwpaAttr.pu8macaddr = mac_addr;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("Error in sending message queue: PTK Key\n");
@@ -4939,7 +4939,7 @@ s32 host_int_add_rx_gtk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKe
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
u8 u8KeyLen = u8GtkKeylen;
if (pstrWFIDrv == NULL) {
@@ -4948,7 +4948,7 @@ s32 host_int_add_rx_gtk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKe
return s32Error;
}
/* prepare the Key Message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
if (pu8RxMic != NULL)
@@ -4956,57 +4956,57 @@ s32 host_int_add_rx_gtk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKe
if (pu8TxMic != NULL)
u8KeyLen += TX_MIC_KEY_LEN;
if (KeyRSC != NULL) {
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwpaAttr.pu8seq = kmalloc(u32KeyRSClen, GFP_KERNEL);
- memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8seq,
+ memcpy(msg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8seq,
KeyRSC, u32KeyRSClen);
}
- strHostIFmsg.u16MsgId = HOST_IF_MSG_KEY;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WPARxGtk;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_KEY;
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WPARxGtk;
+ msg.drvHandler = hWFIDrv;
if (mode == AP_MODE) {
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY_AP;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.u8Ciphermode = u8Ciphermode;
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY_AP;
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.u8Ciphermode = u8Ciphermode;
}
if (mode == STATION_MODE)
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY;
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwpaAttr.pu8key = kmalloc(u8KeyLen, GFP_KERNEL);
- memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key,
+ memcpy(msg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key,
pu8RxGtk, u8GtkKeylen);
if (pu8RxMic != NULL) {
- memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key + 16,
+ memcpy(msg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key + 16,
pu8RxMic, RX_MIC_KEY_LEN);
}
if (pu8TxMic != NULL) {
- memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key + 24,
+ memcpy(msg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key + 24,
pu8TxMic, TX_MIC_KEY_LEN);
}
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwpaAttr.u8keyidx = u8KeyIdx;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwpaAttr.u8Keylen = u8KeyLen;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwpaAttr.u8seqlen = u32KeyRSClen;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("Error in sending message queue: RX GTK\n");
/* ////////////// */
@@ -5040,7 +5040,7 @@ s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, tstrHostIFpmkidAttr *pu8Pm
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
u32 i;
@@ -5051,24 +5051,24 @@ s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, tstrHostIFpmkidAttr *pu8Pm
}
/* prepare the Key Message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_KEY;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = PMKSA;
- strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_KEY;
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = PMKSA;
+ msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY;
+ msg.drvHandler = hWFIDrv;
for (i = 0; i < pu8PmkidInfoArray->numpmkid; i++) {
- memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFpmkidAttr.pmkidlist[i].bssid, &pu8PmkidInfoArray->pmkidlist[i].bssid,
+ memcpy(msg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFpmkidAttr.pmkidlist[i].bssid, &pu8PmkidInfoArray->pmkidlist[i].bssid,
ETH_ALEN);
- memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFpmkidAttr.pmkidlist[i].pmkid, &pu8PmkidInfoArray->pmkidlist[i].pmkid,
+ memcpy(msg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFpmkidAttr.pmkidlist[i].pmkid, &pu8PmkidInfoArray->pmkidlist[i].pmkid,
PMKID_LEN);
}
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER(" Error in sending messagequeue: PMKID Info\n");
@@ -5155,17 +5155,17 @@ s32 host_int_set_RSNAConfigPSKPassPhrase(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8PassPh
s32 host_int_get_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress)
{
s32 s32Error = 0;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
/* prepare the Message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_GET_MAC_ADDRESS;
- strHostIFmsg.uniHostIFmsgBody.strHostIfGetMacAddress.u8MacAddress = pu8MacAddress;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_GET_MAC_ADDRESS;
+ msg.uniHostIFmsgBody.strHostIfGetMacAddress.u8MacAddress = pu8MacAddress;
+ msg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("Failed to send get mac address\n");
return -EFAULT;
@@ -5189,17 +5189,17 @@ s32 host_int_get_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress)
s32 host_int_set_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress)
{
s32 s32Error = 0;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
PRINT_D(GENERIC_DBG, "mac addr = %x:%x:%x\n", pu8MacAddress[0], pu8MacAddress[1], pu8MacAddress[2]);
/* prepare setting mac address message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_SET_MAC_ADDRESS;
- memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIfSetMacAddress.u8MacAddress, pu8MacAddress, ETH_ALEN);
- strHostIFmsg.drvHandler = hWFIDrv;
+ memset(&msg, 0, sizeof(struct host_if_msg));
+ msg.u16MsgId = HOST_IF_MSG_SET_MAC_ADDRESS;
+ memcpy(msg.uniHostIFmsgBody.strHostIfSetMacAddress.u8MacAddress, pu8MacAddress, ETH_ALEN);
+ msg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("Failed to send message queue: Set mac address\n");
@@ -5379,7 +5379,7 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid,
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
tenuScanConnTimer enuScanConnTimer;
if (pstrWFIDrv == NULL || pfConnectResult == NULL) {
@@ -5399,36 +5399,36 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid,
}
/* prepare the Connect Message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_CONNECT;
+ msg.u16MsgId = HOST_IF_MSG_CONNECT;
- strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.u8security = u8security;
- strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.tenuAuth_type = tenuAuth_type;
- strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.u8channel = u8channel;
- strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.pfConnectResult = pfConnectResult;
- strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.pvUserArg = pvUserArg;
- strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.pJoinParams = pJoinParams;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.uniHostIFmsgBody.strHostIFconnectAttr.u8security = u8security;
+ msg.uniHostIFmsgBody.strHostIFconnectAttr.tenuAuth_type = tenuAuth_type;
+ msg.uniHostIFmsgBody.strHostIFconnectAttr.u8channel = u8channel;
+ msg.uniHostIFmsgBody.strHostIFconnectAttr.pfConnectResult = pfConnectResult;
+ msg.uniHostIFmsgBody.strHostIFconnectAttr.pvUserArg = pvUserArg;
+ msg.uniHostIFmsgBody.strHostIFconnectAttr.pJoinParams = pJoinParams;
+ msg.drvHandler = hWFIDrv;
if (pu8bssid != NULL) {
- strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.pu8bssid = kmalloc(6, GFP_KERNEL); /* will be deallocated by the receiving thread */
- memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.pu8bssid,
+ msg.uniHostIFmsgBody.strHostIFconnectAttr.pu8bssid = kmalloc(6, GFP_KERNEL); /* will be deallocated by the receiving thread */
+ memcpy(msg.uniHostIFmsgBody.strHostIFconnectAttr.pu8bssid,
pu8bssid, 6);
}
if (pu8ssid != NULL) {
- strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.ssidLen = ssidLen;
- strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.pu8ssid = kmalloc(ssidLen, GFP_KERNEL); /* will be deallocated by the receiving thread */
- memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.pu8ssid,
+ msg.uniHostIFmsgBody.strHostIFconnectAttr.ssidLen = ssidLen;
+ msg.uniHostIFmsgBody.strHostIFconnectAttr.pu8ssid = kmalloc(ssidLen, GFP_KERNEL); /* will be deallocated by the receiving thread */
+ memcpy(msg.uniHostIFmsgBody.strHostIFconnectAttr.pu8ssid,
pu8ssid, ssidLen);
}
if (pu8IEs != NULL) {
- strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.IEsLen = IEsLen;
- strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.pu8IEs = kmalloc(IEsLen, GFP_KERNEL); /* will be deallocated by the receiving thread */
- memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.pu8IEs,
+ msg.uniHostIFmsgBody.strHostIFconnectAttr.IEsLen = IEsLen;
+ msg.uniHostIFmsgBody.strHostIFconnectAttr.pu8IEs = kmalloc(IEsLen, GFP_KERNEL); /* will be deallocated by the receiving thread */
+ memcpy(msg.uniHostIFmsgBody.strHostIFconnectAttr.pu8IEs,
pu8IEs, IEsLen);
}
if (pstrWFIDrv->enuHostIFstate < HOST_IF_CONNECTING)
@@ -5437,7 +5437,7 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid,
PRINT_D(GENERIC_DBG, "Don't set state to 'connecting' as state is %d\n", pstrWFIDrv->enuHostIFstate);
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("Failed to send message queue: Set join request\n");
return -EFAULT;
@@ -5466,7 +5466,7 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid,
s32 host_int_flush_join_req(tstrWILC_WFIDrv *hWFIDrv)
{
s32 s32Error = 0;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
if (!gu8FlushedJoinReq) {
s32Error = -EFAULT;
@@ -5480,11 +5480,11 @@ s32 host_int_flush_join_req(tstrWILC_WFIDrv *hWFIDrv)
return s32Error;
}
- strHostIFmsg.u16MsgId = HOST_IF_MSG_FLUSH_CONNECT;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_FLUSH_CONNECT;
+ msg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("Failed to send message queue: Flush join request\n");
return -EFAULT;
@@ -5507,7 +5507,7 @@ s32 host_int_flush_join_req(tstrWILC_WFIDrv *hWFIDrv)
s32 host_int_disconnect(tstrWILC_WFIDrv *hWFIDrv, u16 u16ReasonCode)
{
s32 s32Error = 0;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
if (pstrWFIDrv == NULL) {
@@ -5516,13 +5516,13 @@ s32 host_int_disconnect(tstrWILC_WFIDrv *hWFIDrv, u16 u16ReasonCode)
}
/* prepare the Disconnect Message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_DISCONNECT;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_DISCONNECT;
+ msg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("Failed to send message queue: disconnect\n");
/* ////////////// */
@@ -5692,7 +5692,7 @@ s32 host_int_set_mac_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 u8ChNum)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -5700,12 +5700,12 @@ s32 host_int_set_mac_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 u8ChNum)
}
/* prepare the set channel message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_SET_CHANNEL;
- strHostIFmsg.uniHostIFmsgBody.strHostIFSetChan.u8SetChan = u8ChNum;
- strHostIFmsg.drvHandler = hWFIDrv;
+ memset(&msg, 0, sizeof(struct host_if_msg));
+ msg.u16MsgId = HOST_IF_MSG_SET_CHANNEL;
+ msg.uniHostIFmsgBody.strHostIFSetChan.u8SetChan = u8ChNum;
+ msg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("wilc mq send fail\n");
s32Error = -EINVAL;
@@ -5719,13 +5719,13 @@ s32 host_int_wait_msg_queue_idle(void)
{
s32 s32Error = 0;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
/* prepare the set driver handler message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_Q_IDLE;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
+ msg.u16MsgId = HOST_IF_MSG_Q_IDLE;
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("wilc mq send fail\n");
s32Error = -EINVAL;
@@ -5742,17 +5742,17 @@ s32 host_int_set_wfi_drv_handler(tstrWILC_WFIDrv *u32address)
{
s32 s32Error = 0;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
/* prepare the set driver handler message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_SET_WFIDRV_HANDLER;
- strHostIFmsg.uniHostIFmsgBody.strHostIfSetDrvHandler.u32Address = get_id_from_handler(u32address);
- strHostIFmsg.drvHandler = u32address;
+ memset(&msg, 0, sizeof(struct host_if_msg));
+ msg.u16MsgId = HOST_IF_MSG_SET_WFIDRV_HANDLER;
+ msg.uniHostIFmsgBody.strHostIfSetDrvHandler.u32Address = get_id_from_handler(u32address);
+ msg.drvHandler = u32address;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("wilc mq send fail\n");
s32Error = -EINVAL;
@@ -5767,17 +5767,17 @@ s32 host_int_set_operation_mode(tstrWILC_WFIDrv *hWFIDrv, u32 u32mode)
{
s32 s32Error = 0;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
/* prepare the set driver handler message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_SET_OPERATION_MODE;
- strHostIFmsg.uniHostIFmsgBody.strHostIfSetOperationMode.u32Mode = u32mode;
- strHostIFmsg.drvHandler = hWFIDrv;
+ memset(&msg, 0, sizeof(struct host_if_msg));
+ msg.u16MsgId = HOST_IF_MSG_SET_OPERATION_MODE;
+ msg.uniHostIFmsgBody.strHostIfSetOperationMode.u32Mode = u32mode;
+ msg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("wilc mq send fail\n");
s32Error = -EINVAL;
@@ -5805,7 +5805,7 @@ s32 host_int_get_host_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ChNo)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -5813,13 +5813,13 @@ s32 host_int_get_host_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ChNo)
}
/* prepare the Get Channel Message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_GET_CHNL;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_GET_CHNL;
+ msg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc mq send fail\n");
down(&(pstrWFIDrv->hSemGetCHNL));
@@ -5890,24 +5890,24 @@ s32 host_int_get_inactive_time(tstrWILC_WFIDrv *hWFIDrv, const u8 *mac, u32 *pu3
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
- memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIfStaInactiveT.mac,
+ memcpy(msg.uniHostIFmsgBody.strHostIfStaInactiveT.mac,
mac, ETH_ALEN);
- strHostIFmsg.u16MsgId = HOST_IF_MSG_GET_INACTIVETIME;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_GET_INACTIVETIME;
+ msg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("Failed to send get host channel param's message queue ");
@@ -5977,18 +5977,18 @@ s32 host_int_test_get_int_wid(tstrWILC_WFIDrv *hWFIDrv, u32 *pu32TestMemAddr)
s32 host_int_get_rssi(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8Rssi)
{
s32 s32Error = 0;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
/* prepare the Get RSSI Message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_GET_RSSI;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_GET_RSSI;
+ msg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("Failed to send get host channel param's message queue ");
return -EFAULT;
@@ -6011,7 +6011,7 @@ s32 host_int_get_rssi(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8Rssi)
s32 host_int_get_link_speed(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8lnkspd)
{
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -6019,13 +6019,13 @@ s32 host_int_get_link_speed(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8lnkspd)
/* prepare the Get LINKSPEED Message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_GET_LINKSPEED;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_GET_LINKSPEED;
+ msg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("Failed to send GET_LINKSPEED to message queue ");
return -EFAULT;
@@ -6049,17 +6049,17 @@ s32 host_int_get_link_speed(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8lnkspd)
s32 host_int_get_statistics(tstrWILC_WFIDrv *hWFIDrv, tstrStatistics *pstrStatistics)
{
s32 s32Error = 0;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
/* prepare the Get RSSI Message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_GET_STATISTICS;
- strHostIFmsg.uniHostIFmsgBody.pUserData = (char *)pstrStatistics;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_GET_STATISTICS;
+ msg.uniHostIFmsgBody.pUserData = (char *)pstrStatistics;
+ msg.drvHandler = hWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("Failed to send get host channel param's message queue ");
return -EFAULT;
@@ -6094,7 +6094,7 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource,
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
tenuScanConnTimer enuScanConnTimer;
if (pstrWFIDrv == NULL || ScanResult == NULL) {
@@ -6103,35 +6103,35 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource,
}
/* prepare the Scan Message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_SCAN;
+ msg.u16MsgId = HOST_IF_MSG_SCAN;
if (pstrHiddenNetwork != NULL) {
- strHostIFmsg.uniHostIFmsgBody.strHostIFscanAttr.strHiddenNetwork.pstrHiddenNetworkInfo = pstrHiddenNetwork->pstrHiddenNetworkInfo;
- strHostIFmsg.uniHostIFmsgBody.strHostIFscanAttr.strHiddenNetwork.u8ssidnum = pstrHiddenNetwork->u8ssidnum;
+ msg.uniHostIFmsgBody.strHostIFscanAttr.strHiddenNetwork.pstrHiddenNetworkInfo = pstrHiddenNetwork->pstrHiddenNetworkInfo;
+ msg.uniHostIFmsgBody.strHostIFscanAttr.strHiddenNetwork.u8ssidnum = pstrHiddenNetwork->u8ssidnum;
} else
PRINT_D(HOSTINF_DBG, "pstrHiddenNetwork IS EQUAL TO NULL\n");
- strHostIFmsg.drvHandler = hWFIDrv;
- strHostIFmsg.uniHostIFmsgBody.strHostIFscanAttr.u8ScanSource = u8ScanSource;
- strHostIFmsg.uniHostIFmsgBody.strHostIFscanAttr.u8ScanType = u8ScanType;
- strHostIFmsg.uniHostIFmsgBody.strHostIFscanAttr.pfScanResult = ScanResult;
- strHostIFmsg.uniHostIFmsgBody.strHostIFscanAttr.pvUserArg = pvUserArg;
+ msg.drvHandler = hWFIDrv;
+ msg.uniHostIFmsgBody.strHostIFscanAttr.u8ScanSource = u8ScanSource;
+ msg.uniHostIFmsgBody.strHostIFscanAttr.u8ScanType = u8ScanType;
+ msg.uniHostIFmsgBody.strHostIFscanAttr.pfScanResult = ScanResult;
+ msg.uniHostIFmsgBody.strHostIFscanAttr.pvUserArg = pvUserArg;
- strHostIFmsg.uniHostIFmsgBody.strHostIFscanAttr.u8ChnlListLen = u8ChnlListLen;
- strHostIFmsg.uniHostIFmsgBody.strHostIFscanAttr.pu8ChnlFreqList = kmalloc(u8ChnlListLen, GFP_KERNEL); /* will be deallocated by the receiving thread */
- memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFscanAttr.pu8ChnlFreqList,
+ msg.uniHostIFmsgBody.strHostIFscanAttr.u8ChnlListLen = u8ChnlListLen;
+ msg.uniHostIFmsgBody.strHostIFscanAttr.pu8ChnlFreqList = kmalloc(u8ChnlListLen, GFP_KERNEL); /* will be deallocated by the receiving thread */
+ memcpy(msg.uniHostIFmsgBody.strHostIFscanAttr.pu8ChnlFreqList,
pu8ChnlFreqList, u8ChnlListLen);
- strHostIFmsg.uniHostIFmsgBody.strHostIFscanAttr.IEsLen = IEsLen;
- strHostIFmsg.uniHostIFmsgBody.strHostIFscanAttr.pu8IEs = kmalloc(IEsLen, GFP_KERNEL); /* will be deallocated by the receiving thread */
- memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFscanAttr.pu8IEs,
+ msg.uniHostIFmsgBody.strHostIFscanAttr.IEsLen = IEsLen;
+ msg.uniHostIFmsgBody.strHostIFscanAttr.pu8IEs = kmalloc(IEsLen, GFP_KERNEL); /* will be deallocated by the receiving thread */
+ memcpy(msg.uniHostIFmsgBody.strHostIFscanAttr.pu8IEs,
pu8IEs, IEsLen);
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("Error in sending message queue\n");
return -EINVAL;
@@ -6163,7 +6163,7 @@ s32 hif_set_cfg(tstrWILC_WFIDrv *hWFIDrv, tstrCfgParamVal *pstrCfgParamVal)
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
if (pstrWFIDrv == NULL) {
@@ -6171,12 +6171,12 @@ s32 hif_set_cfg(tstrWILC_WFIDrv *hWFIDrv, tstrCfgParamVal *pstrCfgParamVal)
return -EFAULT;
}
/* prepare the WiphyParams Message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_CFG_PARAMS;
- strHostIFmsg.uniHostIFmsgBody.strHostIFCfgParamAttr.pstrCfgParamVal = *pstrCfgParamVal;
- strHostIFmsg.drvHandler = hWFIDrv;
+ memset(&msg, 0, sizeof(struct host_if_msg));
+ msg.u16MsgId = HOST_IF_MSG_CFG_PARAMS;
+ msg.uniHostIFmsgBody.strHostIFCfgParamAttr.pstrCfgParamVal = *pstrCfgParamVal;
+ msg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
return s32Error;
@@ -6339,16 +6339,16 @@ static void GetPeriodicRSSI(unsigned long arg)
if (pstrWFIDrv->enuHostIFstate == HOST_IF_CONNECTED) {
s32 s32Error = 0;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
/* prepare the Get RSSI Message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_GET_RSSI;
- strHostIFmsg.drvHandler = pstrWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_GET_RSSI;
+ msg.drvHandler = pstrWFIDrv;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("Failed to send get host channel param's message queue ");
return;
@@ -6535,7 +6535,7 @@ _fail_:
s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv)
{
s32 s32Error = 0;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
int ret;
/*obtain driver handle*/
@@ -6598,18 +6598,18 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv)
gbScanWhileConnected = false;
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
if (clients_count == 1) {
if (del_timer_sync(&g_hPeriodicRSSI)) {
PRINT_D(HOSTINF_DBG, ">> Connect timer is active\n");
/* msleep(HOST_IF_CONNECT_TIMEOUT+1000); */
}
- strHostIFmsg.u16MsgId = HOST_IF_MSG_EXIT;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_EXIT;
+ msg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error != 0)
PRINT_ER("Error in sending deinit's message queue message function: Error(%d)\n", s32Error);
@@ -6655,7 +6655,7 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv)
void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length)
{
s32 s32Error = 0;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
int id;
tstrWILC_WFIDrv *pstrWFIDrv = NULL;
@@ -6671,18 +6671,18 @@ void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length)
}
/* prepare the Asynchronous Network Info message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_RCVD_NTWRK_INFO;
- strHostIFmsg.drvHandler = pstrWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_RCVD_NTWRK_INFO;
+ msg.drvHandler = pstrWFIDrv;
- strHostIFmsg.uniHostIFmsgBody.strRcvdNetworkInfo.u32Length = u32Length;
- strHostIFmsg.uniHostIFmsgBody.strRcvdNetworkInfo.pu8Buffer = kmalloc(u32Length, GFP_KERNEL); /* will be deallocated by the receiving thread */
- memcpy(strHostIFmsg.uniHostIFmsgBody.strRcvdNetworkInfo.pu8Buffer,
+ msg.uniHostIFmsgBody.strRcvdNetworkInfo.u32Length = u32Length;
+ msg.uniHostIFmsgBody.strRcvdNetworkInfo.pu8Buffer = kmalloc(u32Length, GFP_KERNEL); /* will be deallocated by the receiving thread */
+ memcpy(msg.uniHostIFmsgBody.strRcvdNetworkInfo.pu8Buffer,
pu8Buffer, u32Length);
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("Error in sending network info message queue message parameters: Error(%d)\n", s32Error);
}
@@ -6701,7 +6701,7 @@ void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length)
void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length)
{
s32 s32Error = 0;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
int id;
tstrWILC_WFIDrv *pstrWFIDrv = NULL;
@@ -6729,20 +6729,20 @@ void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length)
}
/* prepare the General Asynchronous Info message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_RCVD_GNRL_ASYNC_INFO;
- strHostIFmsg.drvHandler = pstrWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_RCVD_GNRL_ASYNC_INFO;
+ msg.drvHandler = pstrWFIDrv;
- strHostIFmsg.uniHostIFmsgBody.strRcvdGnrlAsyncInfo.u32Length = u32Length;
- strHostIFmsg.uniHostIFmsgBody.strRcvdGnrlAsyncInfo.pu8Buffer = kmalloc(u32Length, GFP_KERNEL); /* will be deallocated by the receiving thread */
- memcpy(strHostIFmsg.uniHostIFmsgBody.strRcvdGnrlAsyncInfo.pu8Buffer,
+ msg.uniHostIFmsgBody.strRcvdGnrlAsyncInfo.u32Length = u32Length;
+ msg.uniHostIFmsgBody.strRcvdGnrlAsyncInfo.pu8Buffer = kmalloc(u32Length, GFP_KERNEL); /* will be deallocated by the receiving thread */
+ memcpy(msg.uniHostIFmsgBody.strRcvdGnrlAsyncInfo.pu8Buffer,
pu8Buffer, u32Length);
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("Error in sending message queue asynchronous message info: Error(%d)\n", s32Error);
@@ -6762,7 +6762,7 @@ void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length)
void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length)
{
s32 s32Error = 0;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
int id;
tstrWILC_WFIDrv *pstrWFIDrv = NULL;
@@ -6778,22 +6778,22 @@ void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length)
/*if there is an ongoing scan request*/
if (pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult) {
/* prepare theScan Done message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_RCVD_SCAN_COMPLETE;
- strHostIFmsg.drvHandler = pstrWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_RCVD_SCAN_COMPLETE;
+ msg.drvHandler = pstrWFIDrv;
/* will be deallocated by the receiving thread */
/*no need to send message body*/
- /*strHostIFmsg.uniHostIFmsgBody.strScanComplete.u32Length = u32Length;
- * strHostIFmsg.uniHostIFmsgBody.strScanComplete.pu8Buffer = (u8*)WILC_MALLOC(u32Length);
- * memcpy(strHostIFmsg.uniHostIFmsgBody.strScanComplete.pu8Buffer,
+ /*msg.uniHostIFmsgBody.strScanComplete.u32Length = u32Length;
+ * msg.uniHostIFmsgBody.strScanComplete.pu8Buffer = (u8*)WILC_MALLOC(u32Length);
+ * memcpy(msg.uniHostIFmsgBody.strScanComplete.pu8Buffer,
* pu8Buffer, u32Length); */
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("Error in sending message queue scan complete parameters: Error(%d)\n", s32Error);
}
@@ -6821,7 +6821,7 @@ s32 host_int_remain_on_channel(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID, u32 u
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -6829,19 +6829,19 @@ s32 host_int_remain_on_channel(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID, u32 u
}
/* prepare the remainonchan Message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
- strHostIFmsg.u16MsgId = HOST_IF_MSG_REMAIN_ON_CHAN;
- strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan.u16Channel = chan;
- strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan.pRemainOnChanExpired = RemainOnChanExpired;
- strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan.pRemainOnChanReady = RemainOnChanReady;
- strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan.pVoid = pvUserArg;
- strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan.u32duration = u32duration;
- strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID = u32SessionID;
- strHostIFmsg.drvHandler = hWFIDrv;
-
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ msg.u16MsgId = HOST_IF_MSG_REMAIN_ON_CHAN;
+ msg.uniHostIFmsgBody.strHostIfRemainOnChan.u16Channel = chan;
+ msg.uniHostIFmsgBody.strHostIfRemainOnChan.pRemainOnChanExpired = RemainOnChanExpired;
+ msg.uniHostIFmsgBody.strHostIfRemainOnChan.pRemainOnChanReady = RemainOnChanReady;
+ msg.uniHostIFmsgBody.strHostIfRemainOnChan.pVoid = pvUserArg;
+ msg.uniHostIFmsgBody.strHostIfRemainOnChan.u32duration = u32duration;
+ msg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID = u32SessionID;
+ msg.drvHandler = hWFIDrv;
+
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc mq send fail\n");
@@ -6866,7 +6866,7 @@ s32 host_int_ListenStateExpired(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -6877,12 +6877,12 @@ s32 host_int_ListenStateExpired(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID)
del_timer(&pstrWFIDrv->hRemainOnChannel);
/* prepare the timer fire Message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_LISTEN_TIMER_FIRED;
- strHostIFmsg.drvHandler = hWFIDrv;
- strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID = u32SessionID;
+ memset(&msg, 0, sizeof(struct host_if_msg));
+ msg.u16MsgId = HOST_IF_MSG_LISTEN_TIMER_FIRED;
+ msg.drvHandler = hWFIDrv;
+ msg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID = u32SessionID;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc mq send fail\n");
@@ -6901,37 +6901,37 @@ s32 host_int_frame_register(tstrWILC_WFIDrv *hWFIDrv, u16 u16FrameType, bool bRe
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
- strHostIFmsg.u16MsgId = HOST_IF_MSG_REGISTER_FRAME;
+ msg.u16MsgId = HOST_IF_MSG_REGISTER_FRAME;
switch (u16FrameType) {
case ACTION:
PRINT_D(HOSTINF_DBG, "ACTION\n");
- strHostIFmsg.uniHostIFmsgBody.strHostIfRegisterFrame.u8Regid = ACTION_FRM_IDX;
+ msg.uniHostIFmsgBody.strHostIfRegisterFrame.u8Regid = ACTION_FRM_IDX;
break;
case PROBE_REQ:
PRINT_D(HOSTINF_DBG, "PROBE REQ\n");
- strHostIFmsg.uniHostIFmsgBody.strHostIfRegisterFrame.u8Regid = PROBE_REQ_IDX;
+ msg.uniHostIFmsgBody.strHostIfRegisterFrame.u8Regid = PROBE_REQ_IDX;
break;
default:
PRINT_D(HOSTINF_DBG, "Not valid frame type\n");
break;
}
- strHostIFmsg.uniHostIFmsgBody.strHostIfRegisterFrame.u16FrameType = u16FrameType;
- strHostIFmsg.uniHostIFmsgBody.strHostIfRegisterFrame.bReg = bReg;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.uniHostIFmsgBody.strHostIfRegisterFrame.u16FrameType = u16FrameType;
+ msg.uniHostIFmsgBody.strHostIfRegisterFrame.bReg = bReg;
+ msg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc mq send fail\n");
@@ -6958,22 +6958,22 @@ s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32 u32Interval,
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
- tstrHostIFSetBeacon *pstrSetBeaconParam = &strHostIFmsg.uniHostIFmsgBody.strHostIFSetBeacon;
+ struct host_if_msg msg;
+ tstrHostIFSetBeacon *pstrSetBeaconParam = &msg.uniHostIFmsgBody.strHostIFSetBeacon;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
PRINT_D(HOSTINF_DBG, "Setting adding beacon message queue params\n");
/* prepare the WiphyParams Message */
- strHostIFmsg.u16MsgId = HOST_IF_MSG_ADD_BEACON;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_ADD_BEACON;
+ msg.drvHandler = hWFIDrv;
pstrSetBeaconParam->u32Interval = u32Interval;
pstrSetBeaconParam->u32DTIMPeriod = u32DTIMPeriod;
pstrSetBeaconParam->u32HeadLen = u32HeadLen;
@@ -6997,7 +6997,7 @@ s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32 u32Interval,
pstrSetBeaconParam->pu8Tail = NULL;
}
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc mq send fail\n");
@@ -7028,7 +7028,7 @@ s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -7036,11 +7036,11 @@ s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv)
}
/* prepare the WiphyParams Message */
- strHostIFmsg.u16MsgId = HOST_IF_MSG_DEL_BEACON;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_DEL_BEACON;
+ msg.drvHandler = hWFIDrv;
PRINT_D(HOSTINF_DBG, "Setting deleting beacon message queue params\n");
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
@@ -7061,8 +7061,8 @@ s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSta
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
- tstrWILC_AddStaParam *pstrAddStationMsg = &strHostIFmsg.uniHostIFmsgBody.strAddStaParam;
+ struct host_if_msg msg;
+ tstrWILC_AddStaParam *pstrAddStationMsg = &msg.uniHostIFmsgBody.strAddStaParam;
if (pstrWFIDrv == NULL) {
@@ -7070,14 +7070,14 @@ s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSta
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
PRINT_D(HOSTINF_DBG, "Setting adding station message queue params\n");
/* prepare the WiphyParams Message */
- strHostIFmsg.u16MsgId = HOST_IF_MSG_ADD_STATION;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_ADD_STATION;
+ msg.drvHandler = hWFIDrv;
memcpy(pstrAddStationMsg, pstrStaParams, sizeof(tstrWILC_AddStaParam));
if (pstrAddStationMsg->u8NumRates > 0) {
@@ -7091,7 +7091,7 @@ s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSta
}
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
return s32Error;
@@ -7110,23 +7110,23 @@ s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
- tstrHostIFDelSta *pstrDelStationMsg = &strHostIFmsg.uniHostIFmsgBody.strDelStaParam;
+ struct host_if_msg msg;
+ tstrHostIFDelSta *pstrDelStationMsg = &msg.uniHostIFmsgBody.strDelStaParam;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
PRINT_D(HOSTINF_DBG, "Setting deleting station message queue params\n");
/* prepare the WiphyParams Message */
- strHostIFmsg.u16MsgId = HOST_IF_MSG_DEL_STATION;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_DEL_STATION;
+ msg.drvHandler = hWFIDrv;
/*BugID_4795: Handling situation of deleting all stations*/
if (pu8MacAddr == NULL)
@@ -7134,7 +7134,7 @@ s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr)
else
memcpy(pstrDelStationMsg->au8MacAddr, pu8MacAddr, ETH_ALEN);
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
return s32Error;
@@ -7152,8 +7152,8 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN])
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
- tstrHostIFDelAllSta *pstrDelAllStationMsg = &strHostIFmsg.uniHostIFmsgBody.strHostIFDelAllSta;
+ struct host_if_msg msg;
+ tstrHostIFDelAllSta *pstrDelAllStationMsg = &msg.uniHostIFmsgBody.strHostIFDelAllSta;
u8 au8Zero_Buff[ETH_ALEN] = {0};
u32 i;
u8 u8AssocNumb = 0;
@@ -7164,13 +7164,13 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN])
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
PRINT_D(HOSTINF_DBG, "Setting deauthenticating station message queue params\n");
/* prepare the WiphyParams Message */
- strHostIFmsg.u16MsgId = HOST_IF_MSG_DEL_ALL_STA;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_DEL_ALL_STA;
+ msg.drvHandler = hWFIDrv;
/* Handling situation of deauthenticing all associated stations*/
for (i = 0; i < MAX_NUM_STA; i++) {
@@ -7187,7 +7187,7 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN])
}
pstrDelAllStationMsg->u8Num_AssocSta = u8AssocNumb;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
@@ -7212,8 +7212,8 @@ s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSt
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
- tstrWILC_AddStaParam *pstrAddStationMsg = &strHostIFmsg.uniHostIFmsgBody.strAddStaParam;
+ struct host_if_msg msg;
+ tstrWILC_AddStaParam *pstrAddStationMsg = &msg.uniHostIFmsgBody.strAddStaParam;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -7222,12 +7222,12 @@ s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSt
PRINT_D(HOSTINF_DBG, "Setting editing station message queue params\n");
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
- strHostIFmsg.u16MsgId = HOST_IF_MSG_EDIT_STATION;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_EDIT_STATION;
+ msg.drvHandler = hWFIDrv;
memcpy(pstrAddStationMsg, pstrStaParams, sizeof(tstrWILC_AddStaParam));
if (pstrAddStationMsg->u8NumRates > 0) {
@@ -7240,7 +7240,7 @@ s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSt
pstrAddStationMsg->pu8Rates = rates;
}
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
@@ -7253,8 +7253,8 @@ s32 host_int_set_power_mgmt(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32Ti
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
- tstrHostIfPowerMgmtParam *pstrPowerMgmtParam = &strHostIFmsg.uniHostIFmsgBody.strPowerMgmtparam;
+ struct host_if_msg msg;
+ tstrHostIfPowerMgmtParam *pstrPowerMgmtParam = &msg.uniHostIFmsgBody.strPowerMgmtparam;
PRINT_INFO(HOSTINF_DBG, "\n\n>> Setting PS to %d <<\n\n", bIsEnabled);
@@ -7265,18 +7265,18 @@ s32 host_int_set_power_mgmt(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32Ti
PRINT_D(HOSTINF_DBG, "Setting Power management message queue params\n");
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
- strHostIFmsg.u16MsgId = HOST_IF_MSG_POWER_MGMT;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_POWER_MGMT;
+ msg.drvHandler = hWFIDrv;
pstrPowerMgmtParam->bIsEnabled = bIsEnabled;
pstrPowerMgmtParam->u32Timeout = u32Timeout;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
return s32Error;
@@ -7287,8 +7287,8 @@ s32 host_int_setup_multicast_filter(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
- tstrHostIFSetMulti *pstrMulticastFilterParam = &strHostIFmsg.uniHostIFmsgBody.strHostIfSetMulti;
+ struct host_if_msg msg;
+ tstrHostIFSetMulti *pstrMulticastFilterParam = &msg.uniHostIFmsgBody.strHostIfSetMulti;
if (pstrWFIDrv == NULL) {
@@ -7298,17 +7298,17 @@ s32 host_int_setup_multicast_filter(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u
PRINT_D(HOSTINF_DBG, "Setting Multicast Filter params\n");
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
- strHostIFmsg.u16MsgId = HOST_IF_MSG_SET_MULTICAST_FILTER;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.u16MsgId = HOST_IF_MSG_SET_MULTICAST_FILTER;
+ msg.drvHandler = hWFIDrv;
pstrMulticastFilterParam->bIsEnabled = bIsEnabled;
pstrMulticastFilterParam->u32count = u32count;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
return s32Error;
@@ -7554,26 +7554,26 @@ static int host_int_addBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TI
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
- tstrHostIfBASessionInfo *pBASessionInfo = &strHostIFmsg.uniHostIFmsgBody.strHostIfBASessionInfo;
+ struct host_if_msg msg;
+ tstrHostIfBASessionInfo *pBASessionInfo = &msg.uniHostIFmsgBody.strHostIfBASessionInfo;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
- strHostIFmsg.u16MsgId = HOST_IF_MSG_ADD_BA_SESSION;
+ msg.u16MsgId = HOST_IF_MSG_ADD_BA_SESSION;
memcpy(pBASessionInfo->au8Bssid, pBSSID, ETH_ALEN);
pBASessionInfo->u8Ted = TID;
pBASessionInfo->u16BufferSize = BufferSize;
pBASessionInfo->u16SessionTimeout = SessionTimeout;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
@@ -7585,24 +7585,24 @@ s32 host_int_delBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TID)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
- tstrHostIfBASessionInfo *pBASessionInfo = &strHostIFmsg.uniHostIFmsgBody.strHostIfBASessionInfo;
+ struct host_if_msg msg;
+ tstrHostIfBASessionInfo *pBASessionInfo = &msg.uniHostIFmsgBody.strHostIfBASessionInfo;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
- strHostIFmsg.u16MsgId = HOST_IF_MSG_DEL_BA_SESSION;
+ msg.u16MsgId = HOST_IF_MSG_DEL_BA_SESSION;
memcpy(pBASessionInfo->au8Bssid, pBSSID, ETH_ALEN);
pBASessionInfo->u8Ted = TID;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
@@ -7616,24 +7616,24 @@ s32 host_int_del_All_Rx_BASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char T
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
- tstrHostIfBASessionInfo *pBASessionInfo = &strHostIFmsg.uniHostIFmsgBody.strHostIfBASessionInfo;
+ struct host_if_msg msg;
+ tstrHostIfBASessionInfo *pBASessionInfo = &msg.uniHostIFmsgBody.strHostIfBASessionInfo;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
- strHostIFmsg.u16MsgId = HOST_IF_MSG_DEL_ALL_RX_BA_SESSIONS;
+ msg.u16MsgId = HOST_IF_MSG_DEL_ALL_RX_BA_SESSIONS;
memcpy(pBASessionInfo->au8Bssid, pBSSID, ETH_ALEN);
pBASessionInfo->u8Ted = TID;
- strHostIFmsg.drvHandler = hWFIDrv;
+ msg.drvHandler = hWFIDrv;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
@@ -7655,7 +7655,7 @@ s32 host_int_setup_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
/* TODO: Enable This feature on softap firmware */
return 0;
@@ -7665,16 +7665,16 @@ s32 host_int_setup_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx)
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
- strHostIFmsg.u16MsgId = HOST_IF_MSG_SET_IPADDRESS;
+ msg.u16MsgId = HOST_IF_MSG_SET_IPADDRESS;
- strHostIFmsg.uniHostIFmsgBody.strHostIfSetIP.au8IPAddr = u16ipadd;
- strHostIFmsg.drvHandler = hWFIDrv;
- strHostIFmsg.uniHostIFmsgBody.strHostIfSetIP.idx = idx;
+ msg.uniHostIFmsgBody.strHostIfSetIP.au8IPAddr = u16ipadd;
+ msg.drvHandler = hWFIDrv;
+ msg.uniHostIFmsgBody.strHostIfSetIP.idx = idx;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
@@ -7695,23 +7695,23 @@ s32 host_int_get_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
return -EFAULT;
}
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
- strHostIFmsg.u16MsgId = HOST_IF_MSG_GET_IPADDRESS;
+ msg.u16MsgId = HOST_IF_MSG_GET_IPADDRESS;
- strHostIFmsg.uniHostIFmsgBody.strHostIfSetIP.au8IPAddr = u16ipadd;
- strHostIFmsg.drvHandler = hWFIDrv;
- strHostIFmsg.uniHostIFmsgBody.strHostIfSetIP.idx = idx;
+ msg.uniHostIFmsgBody.strHostIfSetIP.au8IPAddr = u16ipadd;
+ msg.drvHandler = hWFIDrv;
+ msg.uniHostIFmsgBody.strHostIfSetIP.idx = idx;
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 04/34] staging: wilc1000: rename u16MsgId
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
2015-09-18 9:11 ` [PATCH 02/34] staging: wilc1000: remove typedef from the struct Tony Cho
2015-09-18 9:11 ` [PATCH 03/34] staging: wilc1000: rename strHostIFmsg Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 05/34] staging: wilc1000 remove typedef from the union Tony Cho
` (29 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch changes the name, u16MsgId simply to id to avoid the camelcase
notation.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 102 +++++++++++++++---------------
1 file changed, 51 insertions(+), 51 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index e03ca8f..d215b12 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -460,7 +460,7 @@ typedef union _tuniHostIFmsgBody {
* @version 1.0
*/
struct host_if_msg {
- u16 u16MsgId; /*!< Message ID */
+ u16 id; /*!< Message ID */
tuniHostIFmsgBody uniHostIFmsgBody; /*!< Message body */
tstrWILC_WFIDrv *drvHandler;
};
@@ -3991,7 +3991,7 @@ static void ListenTimerCB(unsigned long arg)
/* prepare the Timer Callback message */
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_LISTEN_TIMER_FIRED;
+ msg.id = HOST_IF_MSG_LISTEN_TIMER_FIRED;
msg.drvHandler = pstrWFIDrv;
msg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID = pstrWFIDrv->strHostIfRemainOnChan.u32ListenSessionID;
@@ -4323,7 +4323,7 @@ static int hostIFthread(void *pvArg)
while (1) {
wilc_mq_recv(&gMsgQHostIF, &msg, sizeof(struct host_if_msg), &u32Ret);
pstrWFIDrv = (tstrWILC_WFIDrv *)msg.drvHandler;
- if (msg.u16MsgId == HOST_IF_MSG_EXIT) {
+ if (msg.id == HOST_IF_MSG_EXIT) {
PRINT_D(GENERIC_DBG, "THREAD: Exiting HostIfThread\n");
break;
}
@@ -4337,14 +4337,14 @@ static int hostIFthread(void *pvArg)
continue;
}
- if (msg.u16MsgId == HOST_IF_MSG_CONNECT && pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult != NULL) {
+ if (msg.id == HOST_IF_MSG_CONNECT && pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult != NULL) {
PRINT_D(HOSTINF_DBG, "Requeue connect request till scan done received\n");
wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
usleep_range(2 * 1000, 2 * 1000);
continue;
}
- switch (msg.u16MsgId) {
+ switch (msg.id) {
case HOST_IF_MSG_Q_IDLE:
Handle_wait_msg_q_empty();
break;
@@ -4538,7 +4538,7 @@ static void TimerCB_Scan(unsigned long arg)
/* prepare the Timer Callback message */
memset(&msg, 0, sizeof(struct host_if_msg));
msg.drvHandler = pvArg;
- msg.u16MsgId = HOST_IF_MSG_SCAN_TIMER_FIRED;
+ msg.id = HOST_IF_MSG_SCAN_TIMER_FIRED;
/* send the message */
wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
@@ -4552,7 +4552,7 @@ static void TimerCB_Connect(unsigned long arg)
/* prepare the Timer Callback message */
memset(&msg, 0, sizeof(struct host_if_msg));
msg.drvHandler = pvArg;
- msg.u16MsgId = HOST_IF_MSG_CONNECT_TIMER_FIRED;
+ msg.id = HOST_IF_MSG_CONNECT_TIMER_FIRED;
/* send the message */
wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
@@ -4618,7 +4618,7 @@ s32 host_int_remove_wep_key(tstrWILC_WFIDrv *hWFIDrv, u8 u8keyIdx)
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_KEY;
+ msg.id = HOST_IF_MSG_KEY;
msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WEP;
msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = REMOVEKEY;
msg.drvHandler = hWFIDrv;
@@ -4666,7 +4666,7 @@ s32 host_int_set_WEPDefaultKeyID(tstrWILC_WFIDrv *hWFIDrv, u8 u8Index)
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_KEY;
+ msg.id = HOST_IF_MSG_KEY;
msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WEP;
msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = DEFAULTKEY;
msg.drvHandler = hWFIDrv;
@@ -4720,7 +4720,7 @@ s32 host_int_add_wep_key_bss_sta(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey,
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_KEY;
+ msg.id = HOST_IF_MSG_KEY;
msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WEP;
msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY;
msg.drvHandler = hWFIDrv;
@@ -4786,7 +4786,7 @@ s32 host_int_add_wep_key_bss_ap(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, u
for (i = 0; i < u8WepKeylen; i++)
PRINT_INFO(HOSTAPD_DBG, "KEY is %x\n", pu8WepKey[i]);
}
- msg.u16MsgId = HOST_IF_MSG_KEY;
+ msg.id = HOST_IF_MSG_KEY;
msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WEP;
msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY_AP;
msg.drvHandler = hWFIDrv;
@@ -4861,7 +4861,7 @@ s32 host_int_add_ptk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen,
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_KEY;
+ msg.id = HOST_IF_MSG_KEY;
msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WPAPtk;
if (mode == AP_MODE) {
msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY_AP;
@@ -4964,7 +4964,7 @@ s32 host_int_add_rx_gtk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKe
}
- msg.u16MsgId = HOST_IF_MSG_KEY;
+ msg.id = HOST_IF_MSG_KEY;
msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WPARxGtk;
msg.drvHandler = hWFIDrv;
@@ -5053,7 +5053,7 @@ s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, tstrHostIFpmkidAttr *pu8Pm
/* prepare the Key Message */
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_KEY;
+ msg.id = HOST_IF_MSG_KEY;
msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = PMKSA;
msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY;
msg.drvHandler = hWFIDrv;
@@ -5161,7 +5161,7 @@ s32 host_int_get_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress)
/* prepare the Message */
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_GET_MAC_ADDRESS;
+ msg.id = HOST_IF_MSG_GET_MAC_ADDRESS;
msg.uniHostIFmsgBody.strHostIfGetMacAddress.u8MacAddress = pu8MacAddress;
msg.drvHandler = hWFIDrv;
/* send the message */
@@ -5195,7 +5195,7 @@ s32 host_int_set_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress)
/* prepare setting mac address message */
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_SET_MAC_ADDRESS;
+ msg.id = HOST_IF_MSG_SET_MAC_ADDRESS;
memcpy(msg.uniHostIFmsgBody.strHostIfSetMacAddress.u8MacAddress, pu8MacAddress, ETH_ALEN);
msg.drvHandler = hWFIDrv;
@@ -5401,7 +5401,7 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid,
/* prepare the Connect Message */
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_CONNECT;
+ msg.id = HOST_IF_MSG_CONNECT;
msg.uniHostIFmsgBody.strHostIFconnectAttr.u8security = u8security;
msg.uniHostIFmsgBody.strHostIFconnectAttr.tenuAuth_type = tenuAuth_type;
@@ -5480,7 +5480,7 @@ s32 host_int_flush_join_req(tstrWILC_WFIDrv *hWFIDrv)
return s32Error;
}
- msg.u16MsgId = HOST_IF_MSG_FLUSH_CONNECT;
+ msg.id = HOST_IF_MSG_FLUSH_CONNECT;
msg.drvHandler = hWFIDrv;
/* send the message */
@@ -5518,7 +5518,7 @@ s32 host_int_disconnect(tstrWILC_WFIDrv *hWFIDrv, u16 u16ReasonCode)
/* prepare the Disconnect Message */
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_DISCONNECT;
+ msg.id = HOST_IF_MSG_DISCONNECT;
msg.drvHandler = hWFIDrv;
/* send the message */
@@ -5701,7 +5701,7 @@ s32 host_int_set_mac_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 u8ChNum)
/* prepare the set channel message */
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_SET_CHANNEL;
+ msg.id = HOST_IF_MSG_SET_CHANNEL;
msg.uniHostIFmsgBody.strHostIFSetChan.u8SetChan = u8ChNum;
msg.drvHandler = hWFIDrv;
@@ -5724,7 +5724,7 @@ s32 host_int_wait_msg_queue_idle(void)
/* prepare the set driver handler message */
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_Q_IDLE;
+ msg.id = HOST_IF_MSG_Q_IDLE;
s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error) {
PRINT_ER("wilc mq send fail\n");
@@ -5748,7 +5748,7 @@ s32 host_int_set_wfi_drv_handler(tstrWILC_WFIDrv *u32address)
/* prepare the set driver handler message */
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_SET_WFIDRV_HANDLER;
+ msg.id = HOST_IF_MSG_SET_WFIDRV_HANDLER;
msg.uniHostIFmsgBody.strHostIfSetDrvHandler.u32Address = get_id_from_handler(u32address);
msg.drvHandler = u32address;
@@ -5773,7 +5773,7 @@ s32 host_int_set_operation_mode(tstrWILC_WFIDrv *hWFIDrv, u32 u32mode)
/* prepare the set driver handler message */
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_SET_OPERATION_MODE;
+ msg.id = HOST_IF_MSG_SET_OPERATION_MODE;
msg.uniHostIFmsgBody.strHostIfSetOperationMode.u32Mode = u32mode;
msg.drvHandler = hWFIDrv;
@@ -5815,7 +5815,7 @@ s32 host_int_get_host_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ChNo)
/* prepare the Get Channel Message */
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_GET_CHNL;
+ msg.id = HOST_IF_MSG_GET_CHNL;
msg.drvHandler = hWFIDrv;
/* send the message */
@@ -5903,7 +5903,7 @@ s32 host_int_get_inactive_time(tstrWILC_WFIDrv *hWFIDrv, const u8 *mac, u32 *pu3
memcpy(msg.uniHostIFmsgBody.strHostIfStaInactiveT.mac,
mac, ETH_ALEN);
- msg.u16MsgId = HOST_IF_MSG_GET_INACTIVETIME;
+ msg.id = HOST_IF_MSG_GET_INACTIVETIME;
msg.drvHandler = hWFIDrv;
/* send the message */
@@ -5984,7 +5984,7 @@ s32 host_int_get_rssi(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8Rssi)
/* prepare the Get RSSI Message */
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_GET_RSSI;
+ msg.id = HOST_IF_MSG_GET_RSSI;
msg.drvHandler = hWFIDrv;
/* send the message */
@@ -6021,7 +6021,7 @@ s32 host_int_get_link_speed(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8lnkspd)
/* prepare the Get LINKSPEED Message */
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_GET_LINKSPEED;
+ msg.id = HOST_IF_MSG_GET_LINKSPEED;
msg.drvHandler = hWFIDrv;
/* send the message */
@@ -6055,7 +6055,7 @@ s32 host_int_get_statistics(tstrWILC_WFIDrv *hWFIDrv, tstrStatistics *pstrStatis
/* prepare the Get RSSI Message */
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_GET_STATISTICS;
+ msg.id = HOST_IF_MSG_GET_STATISTICS;
msg.uniHostIFmsgBody.pUserData = (char *)pstrStatistics;
msg.drvHandler = hWFIDrv;
/* send the message */
@@ -6105,7 +6105,7 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource,
/* prepare the Scan Message */
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_SCAN;
+ msg.id = HOST_IF_MSG_SCAN;
if (pstrHiddenNetwork != NULL) {
msg.uniHostIFmsgBody.strHostIFscanAttr.strHiddenNetwork.pstrHiddenNetworkInfo = pstrHiddenNetwork->pstrHiddenNetworkInfo;
@@ -6172,7 +6172,7 @@ s32 hif_set_cfg(tstrWILC_WFIDrv *hWFIDrv, tstrCfgParamVal *pstrCfgParamVal)
}
/* prepare the WiphyParams Message */
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_CFG_PARAMS;
+ msg.id = HOST_IF_MSG_CFG_PARAMS;
msg.uniHostIFmsgBody.strHostIFCfgParamAttr.pstrCfgParamVal = *pstrCfgParamVal;
msg.drvHandler = hWFIDrv;
@@ -6344,7 +6344,7 @@ static void GetPeriodicRSSI(unsigned long arg)
/* prepare the Get RSSI Message */
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_GET_RSSI;
+ msg.id = HOST_IF_MSG_GET_RSSI;
msg.drvHandler = pstrWFIDrv;
/* send the message */
@@ -6605,7 +6605,7 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv)
PRINT_D(HOSTINF_DBG, ">> Connect timer is active\n");
/* msleep(HOST_IF_CONNECT_TIMEOUT+1000); */
}
- msg.u16MsgId = HOST_IF_MSG_EXIT;
+ msg.id = HOST_IF_MSG_EXIT;
msg.drvHandler = hWFIDrv;
@@ -6673,7 +6673,7 @@ void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length)
/* prepare the Asynchronous Network Info message */
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_RCVD_NTWRK_INFO;
+ msg.id = HOST_IF_MSG_RCVD_NTWRK_INFO;
msg.drvHandler = pstrWFIDrv;
msg.uniHostIFmsgBody.strRcvdNetworkInfo.u32Length = u32Length;
@@ -6732,7 +6732,7 @@ void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length)
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_RCVD_GNRL_ASYNC_INFO;
+ msg.id = HOST_IF_MSG_RCVD_GNRL_ASYNC_INFO;
msg.drvHandler = pstrWFIDrv;
@@ -6780,7 +6780,7 @@ void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length)
/* prepare theScan Done message */
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_RCVD_SCAN_COMPLETE;
+ msg.id = HOST_IF_MSG_RCVD_SCAN_COMPLETE;
msg.drvHandler = pstrWFIDrv;
@@ -6832,7 +6832,7 @@ s32 host_int_remain_on_channel(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID, u32 u
memset(&msg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
- msg.u16MsgId = HOST_IF_MSG_REMAIN_ON_CHAN;
+ msg.id = HOST_IF_MSG_REMAIN_ON_CHAN;
msg.uniHostIFmsgBody.strHostIfRemainOnChan.u16Channel = chan;
msg.uniHostIFmsgBody.strHostIfRemainOnChan.pRemainOnChanExpired = RemainOnChanExpired;
msg.uniHostIFmsgBody.strHostIfRemainOnChan.pRemainOnChanReady = RemainOnChanReady;
@@ -6878,7 +6878,7 @@ s32 host_int_ListenStateExpired(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID)
/* prepare the timer fire Message */
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_LISTEN_TIMER_FIRED;
+ msg.id = HOST_IF_MSG_LISTEN_TIMER_FIRED;
msg.drvHandler = hWFIDrv;
msg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID = u32SessionID;
@@ -6911,7 +6911,7 @@ s32 host_int_frame_register(tstrWILC_WFIDrv *hWFIDrv, u16 u16FrameType, bool bRe
memset(&msg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
- msg.u16MsgId = HOST_IF_MSG_REGISTER_FRAME;
+ msg.id = HOST_IF_MSG_REGISTER_FRAME;
switch (u16FrameType) {
case ACTION:
PRINT_D(HOSTINF_DBG, "ACTION\n");
@@ -6972,7 +6972,7 @@ s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32 u32Interval,
/* prepare the WiphyParams Message */
- msg.u16MsgId = HOST_IF_MSG_ADD_BEACON;
+ msg.id = HOST_IF_MSG_ADD_BEACON;
msg.drvHandler = hWFIDrv;
pstrSetBeaconParam->u32Interval = u32Interval;
pstrSetBeaconParam->u32DTIMPeriod = u32DTIMPeriod;
@@ -7036,7 +7036,7 @@ s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv)
}
/* prepare the WiphyParams Message */
- msg.u16MsgId = HOST_IF_MSG_DEL_BEACON;
+ msg.id = HOST_IF_MSG_DEL_BEACON;
msg.drvHandler = hWFIDrv;
PRINT_D(HOSTINF_DBG, "Setting deleting beacon message queue params\n");
@@ -7076,7 +7076,7 @@ s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSta
/* prepare the WiphyParams Message */
- msg.u16MsgId = HOST_IF_MSG_ADD_STATION;
+ msg.id = HOST_IF_MSG_ADD_STATION;
msg.drvHandler = hWFIDrv;
memcpy(pstrAddStationMsg, pstrStaParams, sizeof(tstrWILC_AddStaParam));
@@ -7125,7 +7125,7 @@ s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr)
/* prepare the WiphyParams Message */
- msg.u16MsgId = HOST_IF_MSG_DEL_STATION;
+ msg.id = HOST_IF_MSG_DEL_STATION;
msg.drvHandler = hWFIDrv;
/*BugID_4795: Handling situation of deleting all stations*/
@@ -7169,7 +7169,7 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN])
PRINT_D(HOSTINF_DBG, "Setting deauthenticating station message queue params\n");
/* prepare the WiphyParams Message */
- msg.u16MsgId = HOST_IF_MSG_DEL_ALL_STA;
+ msg.id = HOST_IF_MSG_DEL_ALL_STA;
msg.drvHandler = hWFIDrv;
/* Handling situation of deauthenticing all associated stations*/
@@ -7226,7 +7226,7 @@ s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSt
/* prepare the WiphyParams Message */
- msg.u16MsgId = HOST_IF_MSG_EDIT_STATION;
+ msg.id = HOST_IF_MSG_EDIT_STATION;
msg.drvHandler = hWFIDrv;
memcpy(pstrAddStationMsg, pstrStaParams, sizeof(tstrWILC_AddStaParam));
@@ -7269,7 +7269,7 @@ s32 host_int_set_power_mgmt(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32Ti
/* prepare the WiphyParams Message */
- msg.u16MsgId = HOST_IF_MSG_POWER_MGMT;
+ msg.id = HOST_IF_MSG_POWER_MGMT;
msg.drvHandler = hWFIDrv;
pstrPowerMgmtParam->bIsEnabled = bIsEnabled;
@@ -7302,7 +7302,7 @@ s32 host_int_setup_multicast_filter(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u
/* prepare the WiphyParams Message */
- msg.u16MsgId = HOST_IF_MSG_SET_MULTICAST_FILTER;
+ msg.id = HOST_IF_MSG_SET_MULTICAST_FILTER;
msg.drvHandler = hWFIDrv;
pstrMulticastFilterParam->bIsEnabled = bIsEnabled;
@@ -7565,7 +7565,7 @@ static int host_int_addBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TI
memset(&msg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
- msg.u16MsgId = HOST_IF_MSG_ADD_BA_SESSION;
+ msg.id = HOST_IF_MSG_ADD_BA_SESSION;
memcpy(pBASessionInfo->au8Bssid, pBSSID, ETH_ALEN);
pBASessionInfo->u8Ted = TID;
@@ -7596,7 +7596,7 @@ s32 host_int_delBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TID)
memset(&msg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
- msg.u16MsgId = HOST_IF_MSG_DEL_BA_SESSION;
+ msg.id = HOST_IF_MSG_DEL_BA_SESSION;
memcpy(pBASessionInfo->au8Bssid, pBSSID, ETH_ALEN);
pBASessionInfo->u8Ted = TID;
@@ -7627,7 +7627,7 @@ s32 host_int_del_All_Rx_BASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char T
memset(&msg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
- msg.u16MsgId = HOST_IF_MSG_DEL_ALL_RX_BA_SESSIONS;
+ msg.id = HOST_IF_MSG_DEL_ALL_RX_BA_SESSIONS;
memcpy(pBASessionInfo->au8Bssid, pBSSID, ETH_ALEN);
pBASessionInfo->u8Ted = TID;
@@ -7668,7 +7668,7 @@ s32 host_int_setup_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx)
memset(&msg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
- msg.u16MsgId = HOST_IF_MSG_SET_IPADDRESS;
+ msg.id = HOST_IF_MSG_SET_IPADDRESS;
msg.uniHostIFmsgBody.strHostIfSetIP.au8IPAddr = u16ipadd;
msg.drvHandler = hWFIDrv;
@@ -7705,7 +7705,7 @@ s32 host_int_get_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx)
memset(&msg, 0, sizeof(struct host_if_msg));
/* prepare the WiphyParams Message */
- msg.u16MsgId = HOST_IF_MSG_GET_IPADDRESS;
+ msg.id = HOST_IF_MSG_GET_IPADDRESS;
msg.uniHostIFmsgBody.strHostIfSetIP.au8IPAddr = u16ipadd;
msg.drvHandler = hWFIDrv;
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 05/34] staging: wilc1000 remove typedef from the union
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (2 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 04/34] staging: wilc1000: rename u16MsgId Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 06/34] staging: wilc1000: rename uniHostIFmsgBody Tony Cho
` (28 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch gets rid of typedef from the union and renames tuniHostIFmsgBody
with simply message_body because the Linux coding style does not recommend
camelcase notation and typedef for structure, enmu and also union.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index d215b12..6cb35aa 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -409,7 +409,7 @@ typedef struct {
} tstrHostIfStaInactiveT;
/**/
/*!
- * @union tuniHostIFmsgBody
+ * @union message_body
* @brief Message body for the Host Interface message_q
* @details
* @todo
@@ -418,7 +418,7 @@ typedef struct {
* @date 25 March 2012
* @version 1.0
*/
-typedef union _tuniHostIFmsgBody {
+union message_body {
tstrHostIFscanAttr strHostIFscanAttr; /*!< Host IF Scan Request Attributes message body */
tstrHostIFconnectAttr strHostIFconnectAttr; /*!< Host IF Connect Request Attributes message body */
tstrRcvdNetworkInfo strRcvdNetworkInfo; /*!< Received Asynchronous Network Info message body */
@@ -447,7 +447,7 @@ typedef union _tuniHostIFmsgBody {
tstrHostIfRegisterFrame strHostIfRegisterFrame;
char *pUserData;
tstrHostIFDelAllSta strHostIFDelAllSta;
-} tuniHostIFmsgBody;
+};
/*!
* @struct struct host_if_msg
@@ -461,7 +461,7 @@ typedef union _tuniHostIFmsgBody {
*/
struct host_if_msg {
u16 id; /*!< Message ID */
- tuniHostIFmsgBody uniHostIFmsgBody; /*!< Message body */
+ union message_body uniHostIFmsgBody; /*!< Message body */
tstrWILC_WFIDrv *drvHandler;
};
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 06/34] staging: wilc1000: rename uniHostIFmsgBody
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (3 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 05/34] staging: wilc1000 remove typedef from the union Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 07/34] staging: wilc1000: remove typedef from the struct tstrHostIFscanAttr Tony Cho
` (27 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch changes the camelcase notation, uniHostIFmsgBody which is a member
variable of structure host_if_msg to body in order to comply with the Linux
coding style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 296 +++++++++++++++---------------
1 file changed, 148 insertions(+), 148 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 6cb35aa..8b1aa2f 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -461,7 +461,7 @@ union message_body {
*/
struct host_if_msg {
u16 id; /*!< Message ID */
- union message_body uniHostIFmsgBody; /*!< Message body */
+ union message_body body; /*!< Message body */
tstrWILC_WFIDrv *drvHandler;
};
@@ -3993,7 +3993,7 @@ static void ListenTimerCB(unsigned long arg)
memset(&msg, 0, sizeof(struct host_if_msg));
msg.id = HOST_IF_MSG_LISTEN_TIMER_FIRED;
msg.drvHandler = pstrWFIDrv;
- msg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID = pstrWFIDrv->strHostIfRemainOnChan.u32ListenSessionID;
+ msg.body.strHostIfRemainOnChan.u32ListenSessionID = pstrWFIDrv->strHostIfRemainOnChan.u32ListenSessionID;
/* send the message */
s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
@@ -4350,11 +4350,11 @@ static int hostIFthread(void *pvArg)
break;
case HOST_IF_MSG_SCAN:
- Handle_Scan(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIFscanAttr);
+ Handle_Scan(msg.drvHandler, &msg.body.strHostIFscanAttr);
break;
case HOST_IF_MSG_CONNECT:
- Handle_Connect(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIFconnectAttr);
+ Handle_Connect(msg.drvHandler, &msg.body.strHostIFconnectAttr);
break;
/*BugID_5137*/
@@ -4363,24 +4363,24 @@ static int hostIFthread(void *pvArg)
break;
case HOST_IF_MSG_RCVD_NTWRK_INFO:
- Handle_RcvdNtwrkInfo(msg.drvHandler, &msg.uniHostIFmsgBody.strRcvdNetworkInfo);
+ Handle_RcvdNtwrkInfo(msg.drvHandler, &msg.body.strRcvdNetworkInfo);
break;
case HOST_IF_MSG_RCVD_GNRL_ASYNC_INFO:
- Handle_RcvdGnrlAsyncInfo(msg.drvHandler, &msg.uniHostIFmsgBody.strRcvdGnrlAsyncInfo);
+ Handle_RcvdGnrlAsyncInfo(msg.drvHandler, &msg.body.strRcvdGnrlAsyncInfo);
break;
case HOST_IF_MSG_KEY:
- Handle_Key(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIFkeyAttr);
+ Handle_Key(msg.drvHandler, &msg.body.strHostIFkeyAttr);
break;
case HOST_IF_MSG_CFG_PARAMS:
- Handle_CfgParam(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIFCfgParamAttr);
+ Handle_CfgParam(msg.drvHandler, &msg.body.strHostIFCfgParamAttr);
break;
case HOST_IF_MSG_SET_CHANNEL:
- Handle_SetChannel(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIFSetChan);
+ Handle_SetChannel(msg.drvHandler, &msg.body.strHostIFSetChan);
break;
case HOST_IF_MSG_DISCONNECT:
@@ -4399,7 +4399,7 @@ static int hostIFthread(void *pvArg)
Handle_ScanDone(msg.drvHandler, SCAN_EVENT_DONE);
if (pstrWFIDrv->u8RemainOnChan_pendingreq)
- Handle_RemainOnChan(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIfRemainOnChan);
+ Handle_RemainOnChan(msg.drvHandler, &msg.body.strHostIfRemainOnChan);
break;
@@ -4412,7 +4412,7 @@ static int hostIFthread(void *pvArg)
break;
case HOST_IF_MSG_GET_STATISTICS:
- Handle_GetStatistics(msg.drvHandler, (tstrStatistics *)msg.uniHostIFmsgBody.pUserData);
+ Handle_GetStatistics(msg.drvHandler, (tstrStatistics *)msg.body.pUserData);
break;
case HOST_IF_MSG_GET_CHNL:
@@ -4420,27 +4420,27 @@ static int hostIFthread(void *pvArg)
break;
case HOST_IF_MSG_ADD_BEACON:
- Handle_AddBeacon(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIFSetBeacon);
+ Handle_AddBeacon(msg.drvHandler, &msg.body.strHostIFSetBeacon);
break;
case HOST_IF_MSG_DEL_BEACON:
- Handle_DelBeacon(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIFDelBeacon);
+ Handle_DelBeacon(msg.drvHandler, &msg.body.strHostIFDelBeacon);
break;
case HOST_IF_MSG_ADD_STATION:
- Handle_AddStation(msg.drvHandler, &msg.uniHostIFmsgBody.strAddStaParam);
+ Handle_AddStation(msg.drvHandler, &msg.body.strAddStaParam);
break;
case HOST_IF_MSG_DEL_STATION:
- Handle_DelStation(msg.drvHandler, &msg.uniHostIFmsgBody.strDelStaParam);
+ Handle_DelStation(msg.drvHandler, &msg.body.strDelStaParam);
break;
case HOST_IF_MSG_EDIT_STATION:
- Handle_EditStation(msg.drvHandler, &msg.uniHostIFmsgBody.strEditStaParam);
+ Handle_EditStation(msg.drvHandler, &msg.body.strEditStaParam);
break;
case HOST_IF_MSG_GET_INACTIVETIME:
- Handle_Get_InActiveTime(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIfStaInactiveT);
+ Handle_Get_InActiveTime(msg.drvHandler, &msg.body.strHostIfStaInactiveT);
break;
case HOST_IF_MSG_SCAN_TIMER_FIRED:
@@ -4455,68 +4455,68 @@ static int hostIFthread(void *pvArg)
break;
case HOST_IF_MSG_POWER_MGMT:
- Handle_PowerManagement(msg.drvHandler, &msg.uniHostIFmsgBody.strPowerMgmtparam);
+ Handle_PowerManagement(msg.drvHandler, &msg.body.strPowerMgmtparam);
break;
case HOST_IF_MSG_SET_WFIDRV_HANDLER:
Handle_SetWfiDrvHandler(msg.drvHandler,
- &msg.uniHostIFmsgBody.strHostIfSetDrvHandler);
+ &msg.body.strHostIfSetDrvHandler);
break;
case HOST_IF_MSG_SET_OPERATION_MODE:
- Handle_SetOperationMode(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIfSetOperationMode);
+ Handle_SetOperationMode(msg.drvHandler, &msg.body.strHostIfSetOperationMode);
break;
case HOST_IF_MSG_SET_IPADDRESS:
PRINT_D(HOSTINF_DBG, "HOST_IF_MSG_SET_IPADDRESS\n");
- Handle_set_IPAddress(msg.drvHandler, msg.uniHostIFmsgBody.strHostIfSetIP.au8IPAddr, msg.uniHostIFmsgBody.strHostIfSetIP.idx);
+ Handle_set_IPAddress(msg.drvHandler, msg.body.strHostIfSetIP.au8IPAddr, msg.body.strHostIfSetIP.idx);
break;
case HOST_IF_MSG_GET_IPADDRESS:
PRINT_D(HOSTINF_DBG, "HOST_IF_MSG_SET_IPADDRESS\n");
- Handle_get_IPAddress(msg.drvHandler, msg.uniHostIFmsgBody.strHostIfSetIP.au8IPAddr, msg.uniHostIFmsgBody.strHostIfSetIP.idx);
+ Handle_get_IPAddress(msg.drvHandler, msg.body.strHostIfSetIP.au8IPAddr, msg.body.strHostIfSetIP.idx);
break;
/*BugID_5077*/
case HOST_IF_MSG_SET_MAC_ADDRESS:
- Handle_SetMacAddress(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIfSetMacAddress);
+ Handle_SetMacAddress(msg.drvHandler, &msg.body.strHostIfSetMacAddress);
break;
/*BugID_5213*/
case HOST_IF_MSG_GET_MAC_ADDRESS:
- Handle_GetMacAddress(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIfGetMacAddress);
+ Handle_GetMacAddress(msg.drvHandler, &msg.body.strHostIfGetMacAddress);
break;
case HOST_IF_MSG_REMAIN_ON_CHAN:
PRINT_D(HOSTINF_DBG, "HOST_IF_MSG_REMAIN_ON_CHAN\n");
- Handle_RemainOnChan(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIfRemainOnChan);
+ Handle_RemainOnChan(msg.drvHandler, &msg.body.strHostIfRemainOnChan);
break;
case HOST_IF_MSG_REGISTER_FRAME:
PRINT_D(HOSTINF_DBG, "HOST_IF_MSG_REGISTER_FRAME\n");
- Handle_RegisterFrame(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIfRegisterFrame);
+ Handle_RegisterFrame(msg.drvHandler, &msg.body.strHostIfRegisterFrame);
break;
case HOST_IF_MSG_LISTEN_TIMER_FIRED:
- Handle_ListenStateExpired(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIfRemainOnChan);
+ Handle_ListenStateExpired(msg.drvHandler, &msg.body.strHostIfRemainOnChan);
break;
case HOST_IF_MSG_SET_MULTICAST_FILTER:
PRINT_D(HOSTINF_DBG, "HOST_IF_MSG_SET_MULTICAST_FILTER\n");
- Handle_SetMulticastFilter(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIfSetMulti);
+ Handle_SetMulticastFilter(msg.drvHandler, &msg.body.strHostIfSetMulti);
break;
/*BugID_5222*/
case HOST_IF_MSG_ADD_BA_SESSION:
- Handle_AddBASession(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIfBASessionInfo);
+ Handle_AddBASession(msg.drvHandler, &msg.body.strHostIfBASessionInfo);
break;
case HOST_IF_MSG_DEL_ALL_RX_BA_SESSIONS:
- Handle_DelAllRxBASessions(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIfBASessionInfo);
+ Handle_DelAllRxBASessions(msg.drvHandler, &msg.body.strHostIfBASessionInfo);
break;
case HOST_IF_MSG_DEL_ALL_STA:
- Handle_DelAllSta(msg.drvHandler, &msg.uniHostIFmsgBody.strHostIFDelAllSta);
+ Handle_DelAllSta(msg.drvHandler, &msg.body.strHostIFDelAllSta);
break;
default:
@@ -4619,13 +4619,13 @@ s32 host_int_remove_wep_key(tstrWILC_WFIDrv *hWFIDrv, u8 u8keyIdx)
msg.id = HOST_IF_MSG_KEY;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WEP;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = REMOVEKEY;
+ msg.body.strHostIFkeyAttr.enuKeyType = WEP;
+ msg.body.strHostIFkeyAttr.u8KeyAction = REMOVEKEY;
msg.drvHandler = hWFIDrv;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.body.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx = u8keyIdx;
/* send the message */
@@ -4667,12 +4667,12 @@ s32 host_int_set_WEPDefaultKeyID(tstrWILC_WFIDrv *hWFIDrv, u8 u8Index)
msg.id = HOST_IF_MSG_KEY;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WEP;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = DEFAULTKEY;
+ msg.body.strHostIFkeyAttr.enuKeyType = WEP;
+ msg.body.strHostIFkeyAttr.u8KeyAction = DEFAULTKEY;
msg.drvHandler = hWFIDrv;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.body.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx = u8Index;
/* send the message */
@@ -4721,22 +4721,22 @@ s32 host_int_add_wep_key_bss_sta(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey,
msg.id = HOST_IF_MSG_KEY;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WEP;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY;
+ msg.body.strHostIFkeyAttr.enuKeyType = WEP;
+ msg.body.strHostIFkeyAttr.u8KeyAction = ADDKEY;
msg.drvHandler = hWFIDrv;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.body.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey = kmalloc(u8WepKeylen, GFP_KERNEL);
- memcpy(msg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey,
+ memcpy(msg.body.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey,
pu8WepKey, u8WepKeylen);
- msg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.body.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwepAttr.u8WepKeylen = (u8WepKeylen);
- msg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.body.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx = u8Keyidx;
/* send the message */
@@ -4787,29 +4787,29 @@ s32 host_int_add_wep_key_bss_ap(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, u
PRINT_INFO(HOSTAPD_DBG, "KEY is %x\n", pu8WepKey[i]);
}
msg.id = HOST_IF_MSG_KEY;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WEP;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY_AP;
+ msg.body.strHostIFkeyAttr.enuKeyType = WEP;
+ msg.body.strHostIFkeyAttr.u8KeyAction = ADDKEY_AP;
msg.drvHandler = hWFIDrv;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.body.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey = kmalloc(u8WepKeylen, GFP_KERNEL);
- memcpy(msg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey,
+ memcpy(msg.body.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey,
pu8WepKey, (u8WepKeylen));
- msg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.body.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwepAttr.u8WepKeylen = (u8WepKeylen);
- msg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.body.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx = u8Keyidx;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.body.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwepAttr.u8mode = u8mode;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.body.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwepAttr.tenuAuth_type = tenuAuth_type;
/* send the message */
s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
@@ -4862,26 +4862,26 @@ s32 host_int_add_ptk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen,
msg.id = HOST_IF_MSG_KEY;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WPAPtk;
+ msg.body.strHostIFkeyAttr.enuKeyType = WPAPtk;
if (mode == AP_MODE) {
- msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY_AP;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.body.strHostIFkeyAttr.u8KeyAction = ADDKEY_AP;
+ msg.body.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwpaAttr.u8keyidx = u8Idx;
}
if (mode == STATION_MODE)
- msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY;
+ msg.body.strHostIFkeyAttr.u8KeyAction = ADDKEY;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.body.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwpaAttr.pu8key = kmalloc(u8PtkKeylen, GFP_KERNEL);
- memcpy(msg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key,
+ memcpy(msg.body.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key,
pu8Ptk, u8PtkKeylen);
if (pu8RxMic != NULL) {
- memcpy(msg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key + 16,
+ memcpy(msg.body.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key + 16,
pu8RxMic, RX_MIC_KEY_LEN);
if (INFO) {
for (i = 0; i < RX_MIC_KEY_LEN; i++)
@@ -4890,7 +4890,7 @@ s32 host_int_add_ptk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen,
}
if (pu8TxMic != NULL) {
- memcpy(msg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key + 24,
+ memcpy(msg.body.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key + 24,
pu8TxMic, TX_MIC_KEY_LEN);
if (INFO) {
for (i = 0; i < TX_MIC_KEY_LEN; i++)
@@ -4898,12 +4898,12 @@ s32 host_int_add_ptk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen,
}
}
- msg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.body.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwpaAttr.u8Keylen = u8KeyLen;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.body.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwpaAttr.u8Ciphermode = u8Ciphermode;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.body.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwpaAttr.pu8macaddr = mac_addr;
msg.drvHandler = hWFIDrv;
@@ -4956,51 +4956,51 @@ s32 host_int_add_rx_gtk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKe
if (pu8TxMic != NULL)
u8KeyLen += TX_MIC_KEY_LEN;
if (KeyRSC != NULL) {
- msg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.body.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwpaAttr.pu8seq = kmalloc(u32KeyRSClen, GFP_KERNEL);
- memcpy(msg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8seq,
+ memcpy(msg.body.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8seq,
KeyRSC, u32KeyRSClen);
}
msg.id = HOST_IF_MSG_KEY;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WPARxGtk;
+ msg.body.strHostIFkeyAttr.enuKeyType = WPARxGtk;
msg.drvHandler = hWFIDrv;
if (mode == AP_MODE) {
- msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY_AP;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.u8Ciphermode = u8Ciphermode;
+ msg.body.strHostIFkeyAttr.u8KeyAction = ADDKEY_AP;
+ msg.body.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.u8Ciphermode = u8Ciphermode;
}
if (mode == STATION_MODE)
- msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY;
+ msg.body.strHostIFkeyAttr.u8KeyAction = ADDKEY;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.body.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwpaAttr.pu8key = kmalloc(u8KeyLen, GFP_KERNEL);
- memcpy(msg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key,
+ memcpy(msg.body.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key,
pu8RxGtk, u8GtkKeylen);
if (pu8RxMic != NULL) {
- memcpy(msg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key + 16,
+ memcpy(msg.body.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key + 16,
pu8RxMic, RX_MIC_KEY_LEN);
}
if (pu8TxMic != NULL) {
- memcpy(msg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key + 24,
+ memcpy(msg.body.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key + 24,
pu8TxMic, TX_MIC_KEY_LEN);
}
- msg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.body.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwpaAttr.u8keyidx = u8KeyIdx;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.body.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwpaAttr.u8Keylen = u8KeyLen;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.
+ msg.body.strHostIFkeyAttr.
uniHostIFkeyAttr.strHostIFwpaAttr.u8seqlen = u32KeyRSClen;
@@ -5054,16 +5054,16 @@ s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, tstrHostIFpmkidAttr *pu8Pm
memset(&msg, 0, sizeof(struct host_if_msg));
msg.id = HOST_IF_MSG_KEY;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = PMKSA;
- msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY;
+ msg.body.strHostIFkeyAttr.enuKeyType = PMKSA;
+ msg.body.strHostIFkeyAttr.u8KeyAction = ADDKEY;
msg.drvHandler = hWFIDrv;
for (i = 0; i < pu8PmkidInfoArray->numpmkid; i++) {
- memcpy(msg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFpmkidAttr.pmkidlist[i].bssid, &pu8PmkidInfoArray->pmkidlist[i].bssid,
+ memcpy(msg.body.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFpmkidAttr.pmkidlist[i].bssid, &pu8PmkidInfoArray->pmkidlist[i].bssid,
ETH_ALEN);
- memcpy(msg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFpmkidAttr.pmkidlist[i].pmkid, &pu8PmkidInfoArray->pmkidlist[i].pmkid,
+ memcpy(msg.body.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFpmkidAttr.pmkidlist[i].pmkid, &pu8PmkidInfoArray->pmkidlist[i].pmkid,
PMKID_LEN);
}
@@ -5162,7 +5162,7 @@ s32 host_int_get_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress)
memset(&msg, 0, sizeof(struct host_if_msg));
msg.id = HOST_IF_MSG_GET_MAC_ADDRESS;
- msg.uniHostIFmsgBody.strHostIfGetMacAddress.u8MacAddress = pu8MacAddress;
+ msg.body.strHostIfGetMacAddress.u8MacAddress = pu8MacAddress;
msg.drvHandler = hWFIDrv;
/* send the message */
s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
@@ -5196,7 +5196,7 @@ s32 host_int_set_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress)
/* prepare setting mac address message */
memset(&msg, 0, sizeof(struct host_if_msg));
msg.id = HOST_IF_MSG_SET_MAC_ADDRESS;
- memcpy(msg.uniHostIFmsgBody.strHostIfSetMacAddress.u8MacAddress, pu8MacAddress, ETH_ALEN);
+ memcpy(msg.body.strHostIfSetMacAddress.u8MacAddress, pu8MacAddress, ETH_ALEN);
msg.drvHandler = hWFIDrv;
s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
@@ -5403,32 +5403,32 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid,
msg.id = HOST_IF_MSG_CONNECT;
- msg.uniHostIFmsgBody.strHostIFconnectAttr.u8security = u8security;
- msg.uniHostIFmsgBody.strHostIFconnectAttr.tenuAuth_type = tenuAuth_type;
- msg.uniHostIFmsgBody.strHostIFconnectAttr.u8channel = u8channel;
- msg.uniHostIFmsgBody.strHostIFconnectAttr.pfConnectResult = pfConnectResult;
- msg.uniHostIFmsgBody.strHostIFconnectAttr.pvUserArg = pvUserArg;
- msg.uniHostIFmsgBody.strHostIFconnectAttr.pJoinParams = pJoinParams;
+ msg.body.strHostIFconnectAttr.u8security = u8security;
+ msg.body.strHostIFconnectAttr.tenuAuth_type = tenuAuth_type;
+ msg.body.strHostIFconnectAttr.u8channel = u8channel;
+ msg.body.strHostIFconnectAttr.pfConnectResult = pfConnectResult;
+ msg.body.strHostIFconnectAttr.pvUserArg = pvUserArg;
+ msg.body.strHostIFconnectAttr.pJoinParams = pJoinParams;
msg.drvHandler = hWFIDrv;
if (pu8bssid != NULL) {
- msg.uniHostIFmsgBody.strHostIFconnectAttr.pu8bssid = kmalloc(6, GFP_KERNEL); /* will be deallocated by the receiving thread */
- memcpy(msg.uniHostIFmsgBody.strHostIFconnectAttr.pu8bssid,
+ msg.body.strHostIFconnectAttr.pu8bssid = kmalloc(6, GFP_KERNEL); /* will be deallocated by the receiving thread */
+ memcpy(msg.body.strHostIFconnectAttr.pu8bssid,
pu8bssid, 6);
}
if (pu8ssid != NULL) {
- msg.uniHostIFmsgBody.strHostIFconnectAttr.ssidLen = ssidLen;
- msg.uniHostIFmsgBody.strHostIFconnectAttr.pu8ssid = kmalloc(ssidLen, GFP_KERNEL); /* will be deallocated by the receiving thread */
- memcpy(msg.uniHostIFmsgBody.strHostIFconnectAttr.pu8ssid,
+ msg.body.strHostIFconnectAttr.ssidLen = ssidLen;
+ msg.body.strHostIFconnectAttr.pu8ssid = kmalloc(ssidLen, GFP_KERNEL); /* will be deallocated by the receiving thread */
+ memcpy(msg.body.strHostIFconnectAttr.pu8ssid,
pu8ssid, ssidLen);
}
if (pu8IEs != NULL) {
- msg.uniHostIFmsgBody.strHostIFconnectAttr.IEsLen = IEsLen;
- msg.uniHostIFmsgBody.strHostIFconnectAttr.pu8IEs = kmalloc(IEsLen, GFP_KERNEL); /* will be deallocated by the receiving thread */
- memcpy(msg.uniHostIFmsgBody.strHostIFconnectAttr.pu8IEs,
+ msg.body.strHostIFconnectAttr.IEsLen = IEsLen;
+ msg.body.strHostIFconnectAttr.pu8IEs = kmalloc(IEsLen, GFP_KERNEL); /* will be deallocated by the receiving thread */
+ memcpy(msg.body.strHostIFconnectAttr.pu8IEs,
pu8IEs, IEsLen);
}
if (pstrWFIDrv->enuHostIFstate < HOST_IF_CONNECTING)
@@ -5702,7 +5702,7 @@ s32 host_int_set_mac_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 u8ChNum)
/* prepare the set channel message */
memset(&msg, 0, sizeof(struct host_if_msg));
msg.id = HOST_IF_MSG_SET_CHANNEL;
- msg.uniHostIFmsgBody.strHostIFSetChan.u8SetChan = u8ChNum;
+ msg.body.strHostIFSetChan.u8SetChan = u8ChNum;
msg.drvHandler = hWFIDrv;
s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
@@ -5749,7 +5749,7 @@ s32 host_int_set_wfi_drv_handler(tstrWILC_WFIDrv *u32address)
memset(&msg, 0, sizeof(struct host_if_msg));
msg.id = HOST_IF_MSG_SET_WFIDRV_HANDLER;
- msg.uniHostIFmsgBody.strHostIfSetDrvHandler.u32Address = get_id_from_handler(u32address);
+ msg.body.strHostIfSetDrvHandler.u32Address = get_id_from_handler(u32address);
msg.drvHandler = u32address;
s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
@@ -5774,7 +5774,7 @@ s32 host_int_set_operation_mode(tstrWILC_WFIDrv *hWFIDrv, u32 u32mode)
memset(&msg, 0, sizeof(struct host_if_msg));
msg.id = HOST_IF_MSG_SET_OPERATION_MODE;
- msg.uniHostIFmsgBody.strHostIfSetOperationMode.u32Mode = u32mode;
+ msg.body.strHostIfSetOperationMode.u32Mode = u32mode;
msg.drvHandler = hWFIDrv;
s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
@@ -5900,7 +5900,7 @@ s32 host_int_get_inactive_time(tstrWILC_WFIDrv *hWFIDrv, const u8 *mac, u32 *pu3
memset(&msg, 0, sizeof(struct host_if_msg));
- memcpy(msg.uniHostIFmsgBody.strHostIfStaInactiveT.mac,
+ memcpy(msg.body.strHostIfStaInactiveT.mac,
mac, ETH_ALEN);
msg.id = HOST_IF_MSG_GET_INACTIVETIME;
@@ -6056,7 +6056,7 @@ s32 host_int_get_statistics(tstrWILC_WFIDrv *hWFIDrv, tstrStatistics *pstrStatis
memset(&msg, 0, sizeof(struct host_if_msg));
msg.id = HOST_IF_MSG_GET_STATISTICS;
- msg.uniHostIFmsgBody.pUserData = (char *)pstrStatistics;
+ msg.body.pUserData = (char *)pstrStatistics;
msg.drvHandler = hWFIDrv;
/* send the message */
s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
@@ -6108,26 +6108,26 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource,
msg.id = HOST_IF_MSG_SCAN;
if (pstrHiddenNetwork != NULL) {
- msg.uniHostIFmsgBody.strHostIFscanAttr.strHiddenNetwork.pstrHiddenNetworkInfo = pstrHiddenNetwork->pstrHiddenNetworkInfo;
- msg.uniHostIFmsgBody.strHostIFscanAttr.strHiddenNetwork.u8ssidnum = pstrHiddenNetwork->u8ssidnum;
+ msg.body.strHostIFscanAttr.strHiddenNetwork.pstrHiddenNetworkInfo = pstrHiddenNetwork->pstrHiddenNetworkInfo;
+ msg.body.strHostIFscanAttr.strHiddenNetwork.u8ssidnum = pstrHiddenNetwork->u8ssidnum;
} else
PRINT_D(HOSTINF_DBG, "pstrHiddenNetwork IS EQUAL TO NULL\n");
msg.drvHandler = hWFIDrv;
- msg.uniHostIFmsgBody.strHostIFscanAttr.u8ScanSource = u8ScanSource;
- msg.uniHostIFmsgBody.strHostIFscanAttr.u8ScanType = u8ScanType;
- msg.uniHostIFmsgBody.strHostIFscanAttr.pfScanResult = ScanResult;
- msg.uniHostIFmsgBody.strHostIFscanAttr.pvUserArg = pvUserArg;
-
- msg.uniHostIFmsgBody.strHostIFscanAttr.u8ChnlListLen = u8ChnlListLen;
- msg.uniHostIFmsgBody.strHostIFscanAttr.pu8ChnlFreqList = kmalloc(u8ChnlListLen, GFP_KERNEL); /* will be deallocated by the receiving thread */
- memcpy(msg.uniHostIFmsgBody.strHostIFscanAttr.pu8ChnlFreqList,
+ msg.body.strHostIFscanAttr.u8ScanSource = u8ScanSource;
+ msg.body.strHostIFscanAttr.u8ScanType = u8ScanType;
+ msg.body.strHostIFscanAttr.pfScanResult = ScanResult;
+ msg.body.strHostIFscanAttr.pvUserArg = pvUserArg;
+
+ msg.body.strHostIFscanAttr.u8ChnlListLen = u8ChnlListLen;
+ msg.body.strHostIFscanAttr.pu8ChnlFreqList = kmalloc(u8ChnlListLen, GFP_KERNEL); /* will be deallocated by the receiving thread */
+ memcpy(msg.body.strHostIFscanAttr.pu8ChnlFreqList,
pu8ChnlFreqList, u8ChnlListLen);
- msg.uniHostIFmsgBody.strHostIFscanAttr.IEsLen = IEsLen;
- msg.uniHostIFmsgBody.strHostIFscanAttr.pu8IEs = kmalloc(IEsLen, GFP_KERNEL); /* will be deallocated by the receiving thread */
- memcpy(msg.uniHostIFmsgBody.strHostIFscanAttr.pu8IEs,
+ msg.body.strHostIFscanAttr.IEsLen = IEsLen;
+ msg.body.strHostIFscanAttr.pu8IEs = kmalloc(IEsLen, GFP_KERNEL); /* will be deallocated by the receiving thread */
+ memcpy(msg.body.strHostIFscanAttr.pu8IEs,
pu8IEs, IEsLen);
/* send the message */
@@ -6173,7 +6173,7 @@ s32 hif_set_cfg(tstrWILC_WFIDrv *hWFIDrv, tstrCfgParamVal *pstrCfgParamVal)
/* prepare the WiphyParams Message */
memset(&msg, 0, sizeof(struct host_if_msg));
msg.id = HOST_IF_MSG_CFG_PARAMS;
- msg.uniHostIFmsgBody.strHostIFCfgParamAttr.pstrCfgParamVal = *pstrCfgParamVal;
+ msg.body.strHostIFCfgParamAttr.pstrCfgParamVal = *pstrCfgParamVal;
msg.drvHandler = hWFIDrv;
s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
@@ -6676,9 +6676,9 @@ void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length)
msg.id = HOST_IF_MSG_RCVD_NTWRK_INFO;
msg.drvHandler = pstrWFIDrv;
- msg.uniHostIFmsgBody.strRcvdNetworkInfo.u32Length = u32Length;
- msg.uniHostIFmsgBody.strRcvdNetworkInfo.pu8Buffer = kmalloc(u32Length, GFP_KERNEL); /* will be deallocated by the receiving thread */
- memcpy(msg.uniHostIFmsgBody.strRcvdNetworkInfo.pu8Buffer,
+ msg.body.strRcvdNetworkInfo.u32Length = u32Length;
+ msg.body.strRcvdNetworkInfo.pu8Buffer = kmalloc(u32Length, GFP_KERNEL); /* will be deallocated by the receiving thread */
+ memcpy(msg.body.strRcvdNetworkInfo.pu8Buffer,
pu8Buffer, u32Length);
/* send the message */
@@ -6736,9 +6736,9 @@ void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length)
msg.drvHandler = pstrWFIDrv;
- msg.uniHostIFmsgBody.strRcvdGnrlAsyncInfo.u32Length = u32Length;
- msg.uniHostIFmsgBody.strRcvdGnrlAsyncInfo.pu8Buffer = kmalloc(u32Length, GFP_KERNEL); /* will be deallocated by the receiving thread */
- memcpy(msg.uniHostIFmsgBody.strRcvdGnrlAsyncInfo.pu8Buffer,
+ msg.body.strRcvdGnrlAsyncInfo.u32Length = u32Length;
+ msg.body.strRcvdGnrlAsyncInfo.pu8Buffer = kmalloc(u32Length, GFP_KERNEL); /* will be deallocated by the receiving thread */
+ memcpy(msg.body.strRcvdGnrlAsyncInfo.pu8Buffer,
pu8Buffer, u32Length);
/* send the message */
@@ -6787,9 +6787,9 @@ void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length)
/* will be deallocated by the receiving thread */
/*no need to send message body*/
- /*msg.uniHostIFmsgBody.strScanComplete.u32Length = u32Length;
- * msg.uniHostIFmsgBody.strScanComplete.pu8Buffer = (u8*)WILC_MALLOC(u32Length);
- * memcpy(msg.uniHostIFmsgBody.strScanComplete.pu8Buffer,
+ /*msg.body.strScanComplete.u32Length = u32Length;
+ * msg.body.strScanComplete.pu8Buffer = (u8*)WILC_MALLOC(u32Length);
+ * memcpy(msg.body.strScanComplete.pu8Buffer,
* pu8Buffer, u32Length); */
/* send the message */
@@ -6833,12 +6833,12 @@ s32 host_int_remain_on_channel(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID, u32 u
/* prepare the WiphyParams Message */
msg.id = HOST_IF_MSG_REMAIN_ON_CHAN;
- msg.uniHostIFmsgBody.strHostIfRemainOnChan.u16Channel = chan;
- msg.uniHostIFmsgBody.strHostIfRemainOnChan.pRemainOnChanExpired = RemainOnChanExpired;
- msg.uniHostIFmsgBody.strHostIfRemainOnChan.pRemainOnChanReady = RemainOnChanReady;
- msg.uniHostIFmsgBody.strHostIfRemainOnChan.pVoid = pvUserArg;
- msg.uniHostIFmsgBody.strHostIfRemainOnChan.u32duration = u32duration;
- msg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID = u32SessionID;
+ msg.body.strHostIfRemainOnChan.u16Channel = chan;
+ msg.body.strHostIfRemainOnChan.pRemainOnChanExpired = RemainOnChanExpired;
+ msg.body.strHostIfRemainOnChan.pRemainOnChanReady = RemainOnChanReady;
+ msg.body.strHostIfRemainOnChan.pVoid = pvUserArg;
+ msg.body.strHostIfRemainOnChan.u32duration = u32duration;
+ msg.body.strHostIfRemainOnChan.u32ListenSessionID = u32SessionID;
msg.drvHandler = hWFIDrv;
s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
@@ -6880,7 +6880,7 @@ s32 host_int_ListenStateExpired(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID)
memset(&msg, 0, sizeof(struct host_if_msg));
msg.id = HOST_IF_MSG_LISTEN_TIMER_FIRED;
msg.drvHandler = hWFIDrv;
- msg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID = u32SessionID;
+ msg.body.strHostIfRemainOnChan.u32ListenSessionID = u32SessionID;
s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
@@ -6915,20 +6915,20 @@ s32 host_int_frame_register(tstrWILC_WFIDrv *hWFIDrv, u16 u16FrameType, bool bRe
switch (u16FrameType) {
case ACTION:
PRINT_D(HOSTINF_DBG, "ACTION\n");
- msg.uniHostIFmsgBody.strHostIfRegisterFrame.u8Regid = ACTION_FRM_IDX;
+ msg.body.strHostIfRegisterFrame.u8Regid = ACTION_FRM_IDX;
break;
case PROBE_REQ:
PRINT_D(HOSTINF_DBG, "PROBE REQ\n");
- msg.uniHostIFmsgBody.strHostIfRegisterFrame.u8Regid = PROBE_REQ_IDX;
+ msg.body.strHostIfRegisterFrame.u8Regid = PROBE_REQ_IDX;
break;
default:
PRINT_D(HOSTINF_DBG, "Not valid frame type\n");
break;
}
- msg.uniHostIFmsgBody.strHostIfRegisterFrame.u16FrameType = u16FrameType;
- msg.uniHostIFmsgBody.strHostIfRegisterFrame.bReg = bReg;
+ msg.body.strHostIfRegisterFrame.u16FrameType = u16FrameType;
+ msg.body.strHostIfRegisterFrame.bReg = bReg;
msg.drvHandler = hWFIDrv;
s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
@@ -6959,7 +6959,7 @@ s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32 u32Interval,
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrHostIFSetBeacon *pstrSetBeaconParam = &msg.uniHostIFmsgBody.strHostIFSetBeacon;
+ tstrHostIFSetBeacon *pstrSetBeaconParam = &msg.body.strHostIFSetBeacon;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -7062,7 +7062,7 @@ s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSta
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrWILC_AddStaParam *pstrAddStationMsg = &msg.uniHostIFmsgBody.strAddStaParam;
+ tstrWILC_AddStaParam *pstrAddStationMsg = &msg.body.strAddStaParam;
if (pstrWFIDrv == NULL) {
@@ -7111,7 +7111,7 @@ s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr)
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrHostIFDelSta *pstrDelStationMsg = &msg.uniHostIFmsgBody.strDelStaParam;
+ tstrHostIFDelSta *pstrDelStationMsg = &msg.body.strDelStaParam;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -7153,7 +7153,7 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN])
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrHostIFDelAllSta *pstrDelAllStationMsg = &msg.uniHostIFmsgBody.strHostIFDelAllSta;
+ tstrHostIFDelAllSta *pstrDelAllStationMsg = &msg.body.strHostIFDelAllSta;
u8 au8Zero_Buff[ETH_ALEN] = {0};
u32 i;
u8 u8AssocNumb = 0;
@@ -7213,7 +7213,7 @@ s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSt
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrWILC_AddStaParam *pstrAddStationMsg = &msg.uniHostIFmsgBody.strAddStaParam;
+ tstrWILC_AddStaParam *pstrAddStationMsg = &msg.body.strAddStaParam;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -7254,7 +7254,7 @@ s32 host_int_set_power_mgmt(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32Ti
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrHostIfPowerMgmtParam *pstrPowerMgmtParam = &msg.uniHostIFmsgBody.strPowerMgmtparam;
+ tstrHostIfPowerMgmtParam *pstrPowerMgmtParam = &msg.body.strPowerMgmtparam;
PRINT_INFO(HOSTINF_DBG, "\n\n>> Setting PS to %d <<\n\n", bIsEnabled);
@@ -7288,7 +7288,7 @@ s32 host_int_setup_multicast_filter(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrHostIFSetMulti *pstrMulticastFilterParam = &msg.uniHostIFmsgBody.strHostIfSetMulti;
+ tstrHostIFSetMulti *pstrMulticastFilterParam = &msg.body.strHostIfSetMulti;
if (pstrWFIDrv == NULL) {
@@ -7555,7 +7555,7 @@ static int host_int_addBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TI
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrHostIfBASessionInfo *pBASessionInfo = &msg.uniHostIFmsgBody.strHostIfBASessionInfo;
+ tstrHostIfBASessionInfo *pBASessionInfo = &msg.body.strHostIfBASessionInfo;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -7586,7 +7586,7 @@ s32 host_int_delBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TID)
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrHostIfBASessionInfo *pBASessionInfo = &msg.uniHostIFmsgBody.strHostIfBASessionInfo;
+ tstrHostIfBASessionInfo *pBASessionInfo = &msg.body.strHostIfBASessionInfo;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -7617,7 +7617,7 @@ s32 host_int_del_All_Rx_BASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char T
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrHostIfBASessionInfo *pBASessionInfo = &msg.uniHostIFmsgBody.strHostIfBASessionInfo;
+ tstrHostIfBASessionInfo *pBASessionInfo = &msg.body.strHostIfBASessionInfo;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -7670,9 +7670,9 @@ s32 host_int_setup_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx)
/* prepare the WiphyParams Message */
msg.id = HOST_IF_MSG_SET_IPADDRESS;
- msg.uniHostIFmsgBody.strHostIfSetIP.au8IPAddr = u16ipadd;
+ msg.body.strHostIfSetIP.au8IPAddr = u16ipadd;
msg.drvHandler = hWFIDrv;
- msg.uniHostIFmsgBody.strHostIfSetIP.idx = idx;
+ msg.body.strHostIfSetIP.idx = idx;
s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
@@ -7707,9 +7707,9 @@ s32 host_int_get_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx)
/* prepare the WiphyParams Message */
msg.id = HOST_IF_MSG_GET_IPADDRESS;
- msg.uniHostIFmsgBody.strHostIfSetIP.au8IPAddr = u16ipadd;
+ msg.body.strHostIfSetIP.au8IPAddr = u16ipadd;
msg.drvHandler = hWFIDrv;
- msg.uniHostIFmsgBody.strHostIfSetIP.idx = idx;
+ msg.body.strHostIfSetIP.idx = idx;
s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 07/34] staging: wilc1000: remove typedef from the struct tstrHostIFscanAttr
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (4 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 06/34] staging: wilc1000: rename uniHostIFmsgBody Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 08/34] staging: wilc1000: remove typedef from the struct tstrHostIFconnectAttr Tony Cho
` (26 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the structure tstrHostIFscanAttr and
changes the camelcase name, tstrHostIFscanAttr to scan_attr in order to
comply with the Linux coding style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 8b1aa2f..4a02e10 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -155,7 +155,7 @@ typedef struct _tstrHostIFkeyAttr {
/*!
- * @struct tstrHostIFscanAttr
+ * @struct scan_attr
* @brief Structure to hold Host IF Scan Attributes
* @details
* @todo
@@ -164,7 +164,7 @@ typedef struct _tstrHostIFkeyAttr {
* @date 25 March 2012
* @version 1.0
*/
-typedef struct _tstrHostIFscanAttr {
+struct scan_attr {
u8 u8ScanSource;
u8 u8ScanType;
u8 *pu8ChnlFreqList;
@@ -175,8 +175,7 @@ typedef struct _tstrHostIFscanAttr {
void *pvUserArg;
/*BugID_4189*/
tstrHiddenNetwork strHiddenNetwork;
-
-} tstrHostIFscanAttr;
+};
/*!
* @struct tstrHostIFconnectAttr
@@ -419,7 +418,7 @@ typedef struct {
* @version 1.0
*/
union message_body {
- tstrHostIFscanAttr strHostIFscanAttr; /*!< Host IF Scan Request Attributes message body */
+ struct scan_attr strHostIFscanAttr; /*!< Host IF Scan Request Attributes message body */
tstrHostIFconnectAttr strHostIFconnectAttr; /*!< Host IF Connect Request Attributes message body */
tstrRcvdNetworkInfo strRcvdNetworkInfo; /*!< Received Asynchronous Network Info message body */
tstrRcvdGnrlAsyncInfo strRcvdGnrlAsyncInfo; /*!< Received General Asynchronous Info message body */
@@ -1285,13 +1284,14 @@ static s32 Handle_wait_msg_q_empty(void)
/**
* @brief Handle_Scan
* @details Sending config packet to firmware to set the scan params
- * @param[in] tstrHostIFscanAttr* pstrHostIFscanAttr
+ * @param[in] struct scan_attr *pstrHostIFscanAttr
* @return Error code.
* @author
* @date
* @version 1.0
*/
-static s32 Handle_Scan(tstrWILC_WFIDrv *drvHandler, tstrHostIFscanAttr *pstrHostIFscanAttr)
+static s32 Handle_Scan(tstrWILC_WFIDrv *drvHandler,
+ struct scan_attr *pstrHostIFscanAttr)
{
s32 s32Error = 0;
tstrWID strWIDList[5];
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 08/34] staging: wilc1000: remove typedef from the struct tstrHostIFconnectAttr
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (5 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 07/34] staging: wilc1000: remove typedef from the struct tstrHostIFscanAttr Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 09/34] staging: wilc1000: remove typedef from the struct tstrRcvdNetworkInfo Tony Cho
` (25 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the struct tstrHostIFconnectAttr and
renames it to connect_attr to comply with the Linux coding style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 4a02e10..7f1b801 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -178,7 +178,7 @@ struct scan_attr {
};
/*!
- * @struct tstrHostIFconnectAttr
+ * @struct connect_attr
* @brief Structure to hold Host IF Connect Attributes
* @details
* @todo
@@ -187,7 +187,7 @@ struct scan_attr {
* @date 25 March 2012
* @version 1.0
*/
-typedef struct _tstrHostIFconnectAttr {
+struct connect_attr {
u8 *pu8bssid;
u8 *pu8ssid;
size_t ssidLen;
@@ -199,7 +199,7 @@ typedef struct _tstrHostIFconnectAttr {
AUTHTYPE_T tenuAuth_type;
u8 u8channel;
void *pJoinParams;
-} tstrHostIFconnectAttr;
+};
/*!
* @struct tstrRcvdGnrlAsyncInfo
@@ -419,7 +419,7 @@ typedef struct {
*/
union message_body {
struct scan_attr strHostIFscanAttr; /*!< Host IF Scan Request Attributes message body */
- tstrHostIFconnectAttr strHostIFconnectAttr; /*!< Host IF Connect Request Attributes message body */
+ struct connect_attr strHostIFconnectAttr; /*!< Host IF Connect Request Attributes message body */
tstrRcvdNetworkInfo strRcvdNetworkInfo; /*!< Received Asynchronous Network Info message body */
tstrRcvdGnrlAsyncInfo strRcvdGnrlAsyncInfo; /*!< Received General Asynchronous Info message body */
tstrHostIFkeyAttr strHostIFkeyAttr; /*!<>*/
@@ -1512,14 +1512,15 @@ static s32 Handle_ScanDone(tstrWILC_WFIDrv *drvHandler, tenuScanEvent enuEvent)
/**
* @brief Handle_Connect
* @details Sending config packet to firmware to starting connection
- * @param[in] tstrHostIFconnectAttr* pstrHostIFconnectAttr
+ * @param[in] struct connect_attr *pstrHostIFconnectAttr
* @return Error code.
* @author
* @date
* @version 1.0
*/
u8 u8ConnectedSSID[6] = {0};
-static s32 Handle_Connect(tstrWILC_WFIDrv *drvHandler, tstrHostIFconnectAttr *pstrHostIFconnectAttr)
+static s32 Handle_Connect(tstrWILC_WFIDrv *drvHandler,
+ struct connect_attr *pstrHostIFconnectAttr)
{
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *) drvHandler;
s32 s32Error = 0;
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 09/34] staging: wilc1000: remove typedef from the struct tstrRcvdNetworkInfo
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (6 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 08/34] staging: wilc1000: remove typedef from the struct tstrHostIFconnectAttr Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 10/34] staging: wilc1000: remove typedef from the struct tstrRcvdGnrlAsyncInfo Tony Cho
` (24 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the struct tstrRcvdNetworkInfo and
renames it to rcvd_net_info in order to comply with the Linux coding
style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 7 ++++---
drivers/staging/wilc1000/host_interface.h | 6 +++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 7f1b801..803c36d 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -420,7 +420,7 @@ typedef struct {
union message_body {
struct scan_attr strHostIFscanAttr; /*!< Host IF Scan Request Attributes message body */
struct connect_attr strHostIFconnectAttr; /*!< Host IF Connect Request Attributes message body */
- tstrRcvdNetworkInfo strRcvdNetworkInfo; /*!< Received Asynchronous Network Info message body */
+ struct rcvd_net_info strRcvdNetworkInfo; /*!< Received Asynchronous Network Info message body */
tstrRcvdGnrlAsyncInfo strRcvdGnrlAsyncInfo; /*!< Received General Asynchronous Info message body */
tstrHostIFkeyAttr strHostIFkeyAttr; /*!<>*/
tstrHostIFCfgParamAttr strHostIFCfgParamAttr; /*! <CFG Parameter message Body> */
@@ -2262,13 +2262,14 @@ static s32 Handle_ConnectTimeout(tstrWILC_WFIDrv *drvHandler)
/**
* @brief Handle_RcvdNtwrkInfo
* @details Handling received network information
- * @param[in] tstrRcvdNetworkInfo* pstrRcvdNetworkInfo
+ * @param[in] struct rcvd_net_info *pstrRcvdNetworkInfo
* @return Error code.
* @author
* @date
* @version 1.0
*/
-static s32 Handle_RcvdNtwrkInfo(tstrWILC_WFIDrv *drvHandler, tstrRcvdNetworkInfo *pstrRcvdNetworkInfo)
+static s32 Handle_RcvdNtwrkInfo(tstrWILC_WFIDrv *drvHandler,
+ struct rcvd_net_info *pstrRcvdNetworkInfo)
{
u32 i;
bool bNewNtwrkFound;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index fd5fa19..e069a08 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -202,7 +202,7 @@ typedef struct {
} *WILC_WFIDrvHandle;
/*!
- * @struct tstrRcvdNetworkInfo
+ * @struct rcvd_net_info
* @brief Structure to hold Received Asynchronous Network info
* @details
* @todo
@@ -211,10 +211,10 @@ typedef struct {
* @date 25 March 2012
* @version 1.0
*/
-typedef struct _tstrRcvdNetworkInfo {
+struct rcvd_net_info {
u8 *pu8Buffer;
u32 u32Length;
-} tstrRcvdNetworkInfo;
+};
/*BugID_4156*/
typedef struct _tstrHiddenNetworkInfo {
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 10/34] staging: wilc1000: remove typedef from the struct tstrRcvdGnrlAsyncInfo
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (7 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 09/34] staging: wilc1000: remove typedef from the struct tstrRcvdNetworkInfo Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 11/34] staging: wilc1000: remove typedef from the struct tstrHostIFkeyAttr Tony Cho
` (23 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the struct tstrRcvdGnrlAsyncInfo and
renames it to rcvd_async_info in order to comply with the Linux coding
style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 803c36d..c80d00e 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -202,7 +202,7 @@ struct connect_attr {
};
/*!
- * @struct tstrRcvdGnrlAsyncInfo
+ * @struct rcvd_async_info
* @brief Structure to hold Received General Asynchronous info
* @details
* @todo
@@ -211,10 +211,10 @@ struct connect_attr {
* @date 25 March 2012
* @version 1.0
*/
-typedef struct _tstrRcvdGnrlAsyncInfo {
+struct rcvd_async_info {
u8 *pu8Buffer;
u32 u32Length;
-} tstrRcvdGnrlAsyncInfo;
+};
/*!
* @struct tstrHostIFSetChan
@@ -421,7 +421,7 @@ union message_body {
struct scan_attr strHostIFscanAttr; /*!< Host IF Scan Request Attributes message body */
struct connect_attr strHostIFconnectAttr; /*!< Host IF Connect Request Attributes message body */
struct rcvd_net_info strRcvdNetworkInfo; /*!< Received Asynchronous Network Info message body */
- tstrRcvdGnrlAsyncInfo strRcvdGnrlAsyncInfo; /*!< Received General Asynchronous Info message body */
+ struct rcvd_async_info strRcvdGnrlAsyncInfo; /*!< Received General Asynchronous Info message body */
tstrHostIFkeyAttr strHostIFkeyAttr; /*!<>*/
tstrHostIFCfgParamAttr strHostIFCfgParamAttr; /*! <CFG Parameter message Body> */
tstrHostIFSetChan strHostIFSetChan;
@@ -2381,13 +2381,14 @@ done:
/**
* @brief Handle_RcvdGnrlAsyncInfo
* @details Handling received asynchrous general network information
- * @param[in] tstrRcvdGnrlAsyncInfo* pstrRcvdGnrlAsyncInfo
+ * @param[in] struct rcvd_async_info *pstrRcvdGnrlAsyncInfo
* @return Error code.
* @author
* @date
* @version 1.0
*/
-static s32 Handle_RcvdGnrlAsyncInfo(tstrWILC_WFIDrv *drvHandler, tstrRcvdGnrlAsyncInfo *pstrRcvdGnrlAsyncInfo)
+static s32 Handle_RcvdGnrlAsyncInfo(tstrWILC_WFIDrv *drvHandler,
+ struct rcvd_async_info *pstrRcvdGnrlAsyncInfo)
{
/* TODO: mostafa: till now, this function just handles only the received mac status msg, */
/* which carries only 1 WID which have WID ID = WID_STATUS */
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 11/34] staging: wilc1000: remove typedef from the struct tstrHostIFkeyAttr
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (8 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 10/34] staging: wilc1000: remove typedef from the struct tstrRcvdGnrlAsyncInfo Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 12/34] staging: wilc1000: remove typedef from the struct tstrHostIFCfgParamAttr Tony Cho
` (22 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the struct tstrHostIFkeyAttr and renames
it to key_attr in oder to comply with the Linux coding style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index c80d00e..1f0c842 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -136,7 +136,7 @@ typedef union _tuniHostIFkeyAttr {
} tuniHostIFkeyAttr;
/*!
- * @struct tstrHostIFkeyAttr
+ * @struct key_attr
* @brief Structure to hold Host IF Scan Attributes
* @details
* @todo
@@ -145,11 +145,11 @@ typedef union _tuniHostIFkeyAttr {
* @date 25 March 2012
* @version 1.0
*/
-typedef struct _tstrHostIFkeyAttr {
+struct key_attr {
tenuKeyType enuKeyType;
u8 u8KeyAction;
tuniHostIFkeyAttr uniHostIFkeyAttr;
-} tstrHostIFkeyAttr;
+};
@@ -422,7 +422,7 @@ union message_body {
struct connect_attr strHostIFconnectAttr; /*!< Host IF Connect Request Attributes message body */
struct rcvd_net_info strRcvdNetworkInfo; /*!< Received Asynchronous Network Info message body */
struct rcvd_async_info strRcvdGnrlAsyncInfo; /*!< Received General Asynchronous Info message body */
- tstrHostIFkeyAttr strHostIFkeyAttr; /*!<>*/
+ struct key_attr strHostIFkeyAttr; /*!<>*/
tstrHostIFCfgParamAttr strHostIFCfgParamAttr; /*! <CFG Parameter message Body> */
tstrHostIFSetChan strHostIFSetChan;
tstrHostIFGetChan strHostIFGetChan;
@@ -2711,13 +2711,14 @@ static s32 Handle_RcvdGnrlAsyncInfo(tstrWILC_WFIDrv *drvHandler,
/**
* @brief Handle_Key
* @details Sending config packet to firmware to set key
- * @param[in] tstrHostIFkeyAttr* pstrHostIFkeyAttr
+ * @param[in] struct key_attr *pstrHostIFkeyAttr
* @return Error code.
* @author
* @date
* @version 1.0
*/
-static int Handle_Key(tstrWILC_WFIDrv *drvHandler, tstrHostIFkeyAttr *pstrHostIFkeyAttr)
+static int Handle_Key(tstrWILC_WFIDrv *drvHandler,
+ struct key_attr *pstrHostIFkeyAttr)
{
s32 s32Error = 0;
tstrWID strWID;
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 12/34] staging: wilc1000: remove typedef from the struct tstrHostIFCfgParamAttr
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (9 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 11/34] staging: wilc1000: remove typedef from the struct tstrHostIFkeyAttr Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 13/34] staging: wilc1000: remove typedef from the struct tstrHostIFSetChan Tony Cho
` (21 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the struct tstrHostIFCfgParamAttr and
renames it to cfg_param_attr in order to comply with the Linux coding
style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 1f0c842..d863a8c 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -65,7 +65,7 @@ extern u8 g_wilc_initialized;
/*****************************************************************************/
/*!
- * @struct tstrHostIFCfgParamAttr
+ * @struct cfg_param_attr
* @brief Structure to hold Host IF CFG Params Attributes
* @details
* @todo
@@ -74,10 +74,9 @@ extern u8 g_wilc_initialized;
* @date 02 April 2012
* @version 1.0
*/
-typedef struct _tstrHostIFCfgParamAttr {
+struct cfg_param_attr {
tstrCfgParamVal pstrCfgParamVal;
-
-} tstrHostIFCfgParamAttr;
+};
/*!
* @struct tstrHostIFwpaAttr
@@ -423,7 +422,7 @@ union message_body {
struct rcvd_net_info strRcvdNetworkInfo; /*!< Received Asynchronous Network Info message body */
struct rcvd_async_info strRcvdGnrlAsyncInfo; /*!< Received General Asynchronous Info message body */
struct key_attr strHostIFkeyAttr; /*!<>*/
- tstrHostIFCfgParamAttr strHostIFCfgParamAttr; /*! <CFG Parameter message Body> */
+ struct cfg_param_attr strHostIFCfgParamAttr; /*! <CFG Parameter message Body> */
tstrHostIFSetChan strHostIFSetChan;
tstrHostIFGetChan strHostIFGetChan;
tstrHostIFSetBeacon strHostIFSetBeacon; /*!< Set beacon message body */
@@ -925,13 +924,14 @@ static s32 Handle_GetMacAddress(tstrWILC_WFIDrv *drvHandler, tstrHostIfGetMacAdd
/**
* @brief Handle_CfgParam
* @details Sending config packet to firmware to set CFG params
- * @param[in] tstrHostIFCfgParamAttr* strHostIFCfgParamAttr
+ * @param[in] struct cfg_param_attr *strHostIFCfgParamAttr
* @return Error code.
* @author
* @date
* @version 1.0
*/
-static s32 Handle_CfgParam(tstrWILC_WFIDrv *drvHandler, tstrHostIFCfgParamAttr *strHostIFCfgParamAttr)
+static s32 Handle_CfgParam(tstrWILC_WFIDrv *drvHandler,
+ struct cfg_param_attr *strHostIFCfgParamAttr)
{
s32 s32Error = 0;
tstrWID strWIDList[32];
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 13/34] staging: wilc1000: remove typedef from the struct tstrHostIFSetChan
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (10 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 12/34] staging: wilc1000: remove typedef from the struct tstrHostIFCfgParamAttr Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 14/34] staging: wilc1000: remove typedef from the struct tstrHostIFGetChan Tony Cho
` (20 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the struct tstrHostIFSetChan and ranames
it to set_channel in order to comply with the Linux coding style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index d863a8c..2f86a3b 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -216,7 +216,7 @@ struct rcvd_async_info {
};
/*!
- * @struct tstrHostIFSetChan
+ * @struct set_channel
* @brief Set Channel message body
* @details
* @todo
@@ -225,9 +225,9 @@ struct rcvd_async_info {
* @date 25 March 2012
* @version 1.0
*/
-typedef struct _tstrHostIFSetChan {
+struct set_channel {
u8 u8SetChan;
-} tstrHostIFSetChan;
+};
/*!
* @struct tstrHostIFSetChan
@@ -423,7 +423,7 @@ union message_body {
struct rcvd_async_info strRcvdGnrlAsyncInfo; /*!< Received General Asynchronous Info message body */
struct key_attr strHostIFkeyAttr; /*!<>*/
struct cfg_param_attr strHostIFCfgParamAttr; /*! <CFG Parameter message Body> */
- tstrHostIFSetChan strHostIFSetChan;
+ struct set_channel strHostIFSetChan;
tstrHostIFGetChan strHostIFGetChan;
tstrHostIFSetBeacon strHostIFSetBeacon; /*!< Set beacon message body */
tstrHostIFDelBeacon strHostIFDelBeacon; /*!< Del beacon message body */
@@ -635,13 +635,14 @@ static tstrWILC_WFIDrv *get_handler_from_id(int id)
/**
* @brief Handle_SetChannel
* @details Sending config packet to firmware to set channel
- * @param[in] tstrHostIFSetChan* pstrHostIFSetChan
+ * @param[in] struct set_channel *pstrHostIFSetChan
* @return Error code.
* @author
* @date
* @version 1.0
*/
-static s32 Handle_SetChannel(tstrWILC_WFIDrv *drvHandler, tstrHostIFSetChan *pstrHostIFSetChan)
+static s32 Handle_SetChannel(tstrWILC_WFIDrv *drvHandler,
+ struct set_channel *pstrHostIFSetChan)
{
s32 s32Error = 0;
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 14/34] staging: wilc1000: remove typedef from the struct tstrHostIFGetChan
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (11 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 13/34] staging: wilc1000: remove typedef from the struct tstrHostIFSetChan Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 15/34] staging: wilc1000: remove typedef from the struct tstrHostIFSetBeacon Tony Cho
` (19 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the struct tstrHostIFGetChan and renames
it to get_channel in order to comply with the Linux coding style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 2f86a3b..58f138b 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -230,7 +230,7 @@ struct set_channel {
};
/*!
- * @struct tstrHostIFSetChan
+ * @struct get_channel
* @brief Get Channel message body
* @details
* @todo
@@ -239,9 +239,9 @@ struct set_channel {
* @date 01 Jule 2012
* @version 1.0
*/
-typedef struct _tstrHostIFGetChan {
+struct get_channel {
u8 u8GetChan;
-} tstrHostIFGetChan;
+};
/*bug3819: Add Scan acomplete notification to host*/
/*!
@@ -424,7 +424,7 @@ union message_body {
struct key_attr strHostIFkeyAttr; /*!<>*/
struct cfg_param_attr strHostIFCfgParamAttr; /*! <CFG Parameter message Body> */
struct set_channel strHostIFSetChan;
- tstrHostIFGetChan strHostIFGetChan;
+ struct get_channel strHostIFGetChan;
tstrHostIFSetBeacon strHostIFSetBeacon; /*!< Set beacon message body */
tstrHostIFDelBeacon strHostIFDelBeacon; /*!< Del beacon message body */
tstrWILC_AddStaParam strAddStaParam; /*!< Add station message body */
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 15/34] staging: wilc1000: remove typedef from the struct tstrHostIFSetBeacon
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (12 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 14/34] staging: wilc1000: remove typedef from the struct tstrHostIFGetChan Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 16/34] staging: wilc1000: remove typedef from the struct tstrHostIFDelBeacon Tony Cho
` (18 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the struct tstrHostIFSetBeacon and
renames it to set_beacon in order to comply with the Linux coding style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 58f138b..06091da 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -261,7 +261,7 @@ struct get_channel {
* } tstrScanComplete;*/
/*!
- * @struct tstrHostIFSetBeacon
+ * @struct set_beacon
* @brief Set Beacon message body
* @details
* @todo
@@ -270,7 +270,7 @@ struct get_channel {
* @date 10 July 2012
* @version 1.0
*/
-typedef struct _tstrHostIFSetBeacon {
+struct set_beacon {
u32 u32Interval; /*!< Beacon Interval. Period between two successive beacons on air */
u32 u32DTIMPeriod; /*!< DTIM Period. Indicates how many Beacon frames
* (including the current frame) appear before the next DTIM */
@@ -280,7 +280,7 @@ typedef struct _tstrHostIFSetBeacon {
u32 u32TailLen; /*!< Length of the tail buffer in bytes */
u8 *pu8Tail; /*!< Pointer to the beacon's tail buffer. Beacon's tail starts just
* after the TIM inormation element */
-} tstrHostIFSetBeacon;
+};
@@ -425,7 +425,7 @@ union message_body {
struct cfg_param_attr strHostIFCfgParamAttr; /*! <CFG Parameter message Body> */
struct set_channel strHostIFSetChan;
struct get_channel strHostIFGetChan;
- tstrHostIFSetBeacon strHostIFSetBeacon; /*!< Set beacon message body */
+ struct set_beacon strHostIFSetBeacon; /*!< Set beacon message body */
tstrHostIFDelBeacon strHostIFDelBeacon; /*!< Del beacon message body */
tstrWILC_AddStaParam strAddStaParam; /*!< Add station message body */
tstrHostIFDelSta strDelStaParam; /*!< Del Station message body */
@@ -3453,13 +3453,14 @@ static s32 Handle_Get_InActiveTime(tstrWILC_WFIDrv *drvHandler, tstrHostIfStaIna
/**
* @brief Handle_AddBeacon
* @details Sending config packet to add beacon
- * @param[in] tstrHostIFSetBeacon* pstrSetBeaconParam
+ * @param[in] struct set_beacon *pstrSetBeaconParam
* @return NONE
* @author
* @date
* @version 1.0
*/
-static void Handle_AddBeacon(tstrWILC_WFIDrv *drvHandler, tstrHostIFSetBeacon *pstrSetBeaconParam)
+static void Handle_AddBeacon(tstrWILC_WFIDrv *drvHandler,
+ struct set_beacon *pstrSetBeaconParam)
{
s32 s32Error = 0;
tstrWID strWID;
@@ -6964,7 +6965,7 @@ s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32 u32Interval,
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrHostIFSetBeacon *pstrSetBeaconParam = &msg.body.strHostIFSetBeacon;
+ struct set_beacon *pstrSetBeaconParam = &msg.body.strHostIFSetBeacon;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 16/34] staging: wilc1000: remove typedef from the struct tstrHostIFDelBeacon
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (13 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 15/34] staging: wilc1000: remove typedef from the struct tstrHostIFSetBeacon Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 17/34] staging: wilc1000: remove typedef from the struct tstrWILC_AddStaParam Tony Cho
` (17 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the struct tstrHostIFDelBeacon and
renames it to del_beacon in order to comply with the Linux coding style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 06091da..8733c1b 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -285,7 +285,7 @@ struct set_beacon {
/*!
- * @struct tstrHostIFDelBeacon
+ * @struct del_beacon
* @brief Del Beacon message body
* @details
* @todo
@@ -294,9 +294,9 @@ struct set_beacon {
* @date 15 July 2012
* @version 1.0
*/
-typedef struct _tstrHostIFDelBeacon {
+struct del_beacon {
u8 u8dummy;
-} tstrHostIFDelBeacon;
+};
/*!
* @struct tstrHostIFSetMulti
@@ -426,7 +426,7 @@ union message_body {
struct set_channel strHostIFSetChan;
struct get_channel strHostIFGetChan;
struct set_beacon strHostIFSetBeacon; /*!< Set beacon message body */
- tstrHostIFDelBeacon strHostIFDelBeacon; /*!< Del beacon message body */
+ struct del_beacon strHostIFDelBeacon; /*!< Del beacon message body */
tstrWILC_AddStaParam strAddStaParam; /*!< Add station message body */
tstrHostIFDelSta strDelStaParam; /*!< Del Station message body */
tstrWILC_AddStaParam strEditStaParam; /*!< Edit station message body */
@@ -3523,13 +3523,14 @@ ERRORHANDLER:
/**
* @brief Handle_AddBeacon
* @details Sending config packet to delete beacon
- * @param[in] tstrHostIFDelBeacon* pstrDelBeacon
+ * @param[in] struct del_beacon *pstrDelBeacon
* @return NONE
* @author
* @date
* @version 1.0
*/
-static void Handle_DelBeacon(tstrWILC_WFIDrv *drvHandler, tstrHostIFDelBeacon *pstrDelBeacon)
+static void Handle_DelBeacon(tstrWILC_WFIDrv *drvHandler,
+ struct del_beacon *pstrDelBeacon)
{
s32 s32Error = 0;
tstrWID strWID;
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 17/34] staging: wilc1000: remove typedef from the struct tstrWILC_AddStaParam
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (14 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 16/34] staging: wilc1000: remove typedef from the struct tstrHostIFDelBeacon Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 18/34] staging: wilc1000: remove typedef from the struct tstrTimerCb Tony Cho
` (16 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the struct tstrWILC_AddStaParam and
renames it to add_sta_param in oder to comply with the Linux coding
style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 37 +++++++++++++----------
drivers/staging/wilc1000/host_interface.h | 16 ++++++----
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 4 +--
3 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 8733c1b..0308421 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -427,9 +427,9 @@ union message_body {
struct get_channel strHostIFGetChan;
struct set_beacon strHostIFSetBeacon; /*!< Set beacon message body */
struct del_beacon strHostIFDelBeacon; /*!< Del beacon message body */
- tstrWILC_AddStaParam strAddStaParam; /*!< Add station message body */
+ struct add_sta_param strAddStaParam; /*!< Add station message body */
tstrHostIFDelSta strDelStaParam; /*!< Del Station message body */
- tstrWILC_AddStaParam strEditStaParam; /*!< Edit station message body */
+ struct add_sta_param strEditStaParam; /*!< Edit station message body */
/* tstrScanComplete strScanComplete; / *Received Async. Scan Complete message body* / */
tstrTimerCb strTimerCb; /*!< Timer callback message body */
tstrHostIfPowerMgmtParam strPowerMgmtparam; /*!< Power Management message body */
@@ -3561,13 +3561,14 @@ static void Handle_DelBeacon(tstrWILC_WFIDrv *drvHandler,
/**
* @brief WILC_HostIf_PackStaParam
* @details Handling packing of the station params in a buffer
- * @param[in] u8* pu8Buffer, tstrWILC_AddStaParam* pstrStationParam
+ * @param[in] u8* pu8Buffer, struct add_sta_param *pstrStationParam
* @return NONE
* @author
* @date
* @version 1.0
*/
-static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer, tstrWILC_AddStaParam *pstrStationParam)
+static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer,
+ struct add_sta_param *pstrStationParam)
{
u8 *pu8CurrByte;
@@ -3615,13 +3616,14 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer, tstrWILC_AddStaParam *pstrSta
/**
* @brief Handle_AddStation
* @details Sending config packet to add station
- * @param[in] tstrWILC_AddStaParam* pstrStationParam
+ * @param[in] struct add_sta_param *pstrStationParam
* @return NONE
* @author
* @date
* @version 1.0
*/
-static void Handle_AddStation(tstrWILC_WFIDrv *drvHandler, tstrWILC_AddStaParam *pstrStationParam)
+static void Handle_AddStation(tstrWILC_WFIDrv *drvHandler,
+ struct add_sta_param *pstrStationParam)
{
s32 s32Error = 0;
tstrWID strWID;
@@ -3750,13 +3752,14 @@ ERRORHANDLER:
/**
* @brief Handle_EditStation
* @details Sending config packet to edit station
- * @param[in] tstrWILC_AddStaParam* pstrStationParam
+ * @param[in] struct add_sta_param *pstrStationParam
* @return NONE
* @author
* @date
* @version 1.0
*/
-static void Handle_EditStation(tstrWILC_WFIDrv *drvHandler, tstrWILC_AddStaParam *pstrStationParam)
+static void Handle_EditStation(tstrWILC_WFIDrv *drvHandler,
+ struct add_sta_param *pstrStationParam)
{
s32 s32Error = 0;
tstrWID strWID;
@@ -7058,18 +7061,19 @@ s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv)
/**
* @brief host_int_add_station
* @details Setting add station params in message queue
- * @param[in] WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam* pstrStaParams
+ * @param[in] WILC_WFIDrvHandle hWFIDrv, struct add_sta_param *pstrStaParams
* @return Error code.
* @author
* @date
* @version 1.0
*/
-s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrStaParams)
+s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv,
+ struct add_sta_param *pstrStaParams)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrWILC_AddStaParam *pstrAddStationMsg = &msg.body.strAddStaParam;
+ struct add_sta_param *pstrAddStationMsg = &msg.body.strAddStaParam;
if (pstrWFIDrv == NULL) {
@@ -7086,7 +7090,7 @@ s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSta
msg.id = HOST_IF_MSG_ADD_STATION;
msg.drvHandler = hWFIDrv;
- memcpy(pstrAddStationMsg, pstrStaParams, sizeof(tstrWILC_AddStaParam));
+ memcpy(pstrAddStationMsg, pstrStaParams, sizeof(struct add_sta_param));
if (pstrAddStationMsg->u8NumRates > 0) {
u8 *rates = kmalloc(pstrAddStationMsg->u8NumRates, GFP_KERNEL);
@@ -7209,18 +7213,19 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN])
/**
* @brief host_int_edit_station
* @details Setting edit station params in message queue
- * @param[in] WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam* pstrStaParams
+ * @param[in] WILC_WFIDrvHandle hWFIDrv, struct add_sta_param *pstrStaParams
* @return Error code.
* @author
* @date
* @version 1.0
*/
-s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrStaParams)
+s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv,
+ struct add_sta_param *pstrStaParams)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrWILC_AddStaParam *pstrAddStationMsg = &msg.body.strAddStaParam;
+ struct add_sta_param *pstrAddStationMsg = &msg.body.strAddStaParam;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -7236,7 +7241,7 @@ s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSt
msg.id = HOST_IF_MSG_EDIT_STATION;
msg.drvHandler = hWFIDrv;
- memcpy(pstrAddStationMsg, pstrStaParams, sizeof(tstrWILC_AddStaParam));
+ memcpy(pstrAddStationMsg, pstrStaParams, sizeof(struct add_sta_param));
if (pstrAddStationMsg->u8NumRates > 0) {
u8 *rates = kmalloc(pstrAddStationMsg->u8NumRates, GFP_KERNEL);
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index e069a08..90493c6 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -373,7 +373,7 @@ typedef enum {
WILC_STA_FLAG_AUTHENTICATED /*!< station is authenticated*/
} tenuWILC_StaFlag;
-typedef struct {
+struct add_sta_param {
u8 au8BSSID[ETH_ALEN];
u16 u16AssocID;
u8 u8NumRates;
@@ -387,7 +387,7 @@ typedef struct {
u8 u8ASELCap;
u16 u16FlagsMask; /*<! Determines which of u16FlagsSet were changed>*/
u16 u16FlagsSet; /*<! Decoded according to tenuWILC_StaFlag */
-} tstrWILC_AddStaParam;
+};
/*****************************************************************************/
/* */
@@ -1053,7 +1053,8 @@ s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32 u32Interval,
s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv);
/*!
- * @fn s32 host_int_add_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam strStaParams)
+ * @fn s32 host_int_add_station(WILC_WFIDrvHandle hWFIDrv,
+ * struct add_sta_param *pstrStaParams)
* @brief Notifies the firmware with a new associated stations
* @details
* @param[in,out] hWFIDrv handle to the wifi driver
@@ -1065,7 +1066,8 @@ s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv);
* @date 12 July 2012
* @version 1.0 Description
*/
-s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrStaParams);
+s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv,
+ struct add_sta_param *pstrStaParams);
/*!
* @fn s32 host_int_del_allstation(WILC_WFIDrvHandle hWFIDrv, const u8* pu8MacAddr)
@@ -1098,7 +1100,8 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN])
s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr);
/*!
- * @fn s32 host_int_edit_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam strStaParams)
+ * @fn s32 host_int_edit_station(WILC_WFIDrvHandle hWFIDrv,
+ * struct add_sta_param *pstrStaParams)
* @brief Notifies the firmware with new parameters of an already associated station
* @details
* @param[in,out] hWFIDrv handle to the wifi driver
@@ -1110,7 +1113,8 @@ s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr);
* @date 15 July 2012
* @version 1.0 Description
*/
-s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrStaParams);
+s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv,
+ struct add_sta_param *pstrStaParams);
/*!
* @fn s32 host_int_set_power_mgmt(WILC_WFIDrvHandle hWFIDrv, bool bIsEnabled, u32 u32Timeout)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index a2c80db..30858cb 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3203,7 +3203,7 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev,
{
s32 s32Error = 0;
struct wilc_priv *priv;
- tstrWILC_AddStaParam strStaParams = { {0} };
+ struct add_sta_param strStaParams = { {0} };
perInterface_wlan_t *nic;
if (!wiphy)
@@ -3314,7 +3314,7 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev,
{
s32 s32Error = 0;
struct wilc_priv *priv;
- tstrWILC_AddStaParam strStaParams = { {0} };
+ struct add_sta_param strStaParams = { {0} };
perInterface_wlan_t *nic;
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 18/34] staging: wilc1000: remove typedef from the struct tstrTimerCb
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (15 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 17/34] staging: wilc1000: remove typedef from the struct tstrWILC_AddStaParam Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 19/34] staging: wilc1000: remove typedef from the struct tstrHostIfPowerMgmtParam Tony Cho
` (15 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the tstrTimerCb and renames it to
timer_cb in order to comply with the Linux coding style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 0308421..5f546e5 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -346,7 +346,7 @@ typedef struct {
} tstrHostIFDelSta;
/*!
- * @struct tstrTimerCb
+ * @struct timer_cb
* @brief Timer callback message body
* @details
* @todo
@@ -355,9 +355,9 @@ typedef struct {
* @date 25 March 2012
* @version 1.0
*/
-typedef struct _tstrTimerCb {
+struct timer_cb {
void *pvUsrArg; /*!< Private data passed at timer start */
-} tstrTimerCb;
+};
/*!
* @struct tstrHostIfPowerMgmtParam
@@ -431,7 +431,7 @@ union message_body {
tstrHostIFDelSta strDelStaParam; /*!< Del Station message body */
struct add_sta_param strEditStaParam; /*!< Edit station message body */
/* tstrScanComplete strScanComplete; / *Received Async. Scan Complete message body* / */
- tstrTimerCb strTimerCb; /*!< Timer callback message body */
+ struct timer_cb strTimerCb; /*!< Timer callback message body */
tstrHostIfPowerMgmtParam strPowerMgmtparam; /*!< Power Management message body */
tstrHostIfStaInactiveT strHostIfStaInactiveT;
tstrHostIFSetIPAddr strHostIfSetIP;
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 19/34] staging: wilc1000: remove typedef from the struct tstrHostIfPowerMgmtParam
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (16 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 18/34] staging: wilc1000: remove typedef from the struct tstrTimerCb Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 20/34] staging: wilc1000: remove typedef from the struct tstrHostIfStaInactiveT Tony Cho
` (14 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the struct tstrHostIfPowerMgmtParam and
renames it to power_mgmt_param in order to comply with the Linux coding
style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 5f546e5..12adb03 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -360,7 +360,7 @@ struct timer_cb {
};
/*!
- * @struct tstrHostIfPowerMgmtParam
+ * @struct power_mgmt_param
* @brief Power management message body
* @details
* @todo
@@ -369,11 +369,11 @@ struct timer_cb {
* @date 24 November 2012
* @version 1.0
*/
-typedef struct {
+struct power_mgmt_param {
bool bIsEnabled;
u32 u32Timeout;
-} tstrHostIfPowerMgmtParam;
+};
/*!
* @struct tstrHostIFSetIPAddr
@@ -432,7 +432,7 @@ union message_body {
struct add_sta_param strEditStaParam; /*!< Edit station message body */
/* tstrScanComplete strScanComplete; / *Received Async. Scan Complete message body* / */
struct timer_cb strTimerCb; /*!< Timer callback message body */
- tstrHostIfPowerMgmtParam strPowerMgmtparam; /*!< Power Management message body */
+ struct power_mgmt_param strPowerMgmtparam; /*!< Power Management message body */
tstrHostIfStaInactiveT strHostIfStaInactiveT;
tstrHostIFSetIPAddr strHostIfSetIP;
tstrHostIfSetDrvHandler strHostIfSetDrvHandler;
@@ -4020,7 +4020,8 @@ static void ListenTimerCB(unsigned long arg)
* @date
* @version 1.0
*/
-static void Handle_PowerManagement(tstrWILC_WFIDrv *drvHandler, tstrHostIfPowerMgmtParam *strPowerMgmtParam)
+static void Handle_PowerManagement(tstrWILC_WFIDrv *drvHandler,
+ struct power_mgmt_param *strPowerMgmtParam)
{
s32 s32Error = 0;
tstrWID strWID;
@@ -7266,7 +7267,7 @@ s32 host_int_set_power_mgmt(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32Ti
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrHostIfPowerMgmtParam *pstrPowerMgmtParam = &msg.body.strPowerMgmtparam;
+ struct power_mgmt_param *pstrPowerMgmtParam = &msg.body.strPowerMgmtparam;
PRINT_INFO(HOSTINF_DBG, "\n\n>> Setting PS to %d <<\n\n", bIsEnabled);
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 20/34] staging: wilc1000: remove typedef from the struct tstrHostIfStaInactiveT
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (17 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 19/34] staging: wilc1000: remove typedef from the struct tstrHostIfPowerMgmtParam Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 21/34] staging: wilc1000: remove typedef from the struct tstrHostIFSetIPAddr Tony Cho
` (13 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the struct tstrHostIfStaInactiveT and
renames it to sta_inactive_t in oder to comply with the Linux coding
style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 12adb03..8fc9186 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -392,7 +392,7 @@ typedef struct {
} tstrHostIFSetIPAddr;
/*!
- * @struct tstrHostIfStaInactiveT
+ * @struct sta_inactive_t
* @brief Get station message body
* @details
* @todo
@@ -401,10 +401,9 @@ typedef struct {
* @date 16 April 2013
* @version 1.0
*/
-typedef struct {
+struct sta_inactive_t {
u8 mac[6];
-
-} tstrHostIfStaInactiveT;
+};
/**/
/*!
* @union message_body
@@ -433,7 +432,7 @@ union message_body {
/* tstrScanComplete strScanComplete; / *Received Async. Scan Complete message body* / */
struct timer_cb strTimerCb; /*!< Timer callback message body */
struct power_mgmt_param strPowerMgmtparam; /*!< Power Management message body */
- tstrHostIfStaInactiveT strHostIfStaInactiveT;
+ struct sta_inactive_t strHostIfStaInactiveT;
tstrHostIFSetIPAddr strHostIfSetIP;
tstrHostIfSetDrvHandler strHostIfSetDrvHandler;
tstrHostIFSetMulti strHostIfSetMulti;
@@ -3393,7 +3392,8 @@ s32 Handle_GetStatistics(tstrWILC_WFIDrv *drvHandler, tstrStatistics *pstrStatis
* @date
* @version 1.0
*/
-static s32 Handle_Get_InActiveTime(tstrWILC_WFIDrv *drvHandler, tstrHostIfStaInactiveT *strHostIfStaInactiveT)
+static s32 Handle_Get_InActiveTime(tstrWILC_WFIDrv *drvHandler,
+ struct sta_inactive_t *strHostIfStaInactiveT)
{
s32 s32Error = 0;
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 21/34] staging: wilc1000: remove typedef from the struct tstrHostIFSetIPAddr
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (18 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 20/34] staging: wilc1000: remove typedef from the struct tstrHostIfStaInactiveT Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 22/34] staging: wilc1000: remove typedef from the struct tstrHostIfSetDrvHandler Tony Cho
` (12 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the struct tstrHostIFSetIPAddr and
renames it to set_ip_addr in order to comply with the Linux coding
style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 8fc9186..8b995c3 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -376,7 +376,7 @@ struct power_mgmt_param {
};
/*!
- * @struct tstrHostIFSetIPAddr
+ * @struct set_ip_addr
* @brief set IP Address message body
* @details
* @todo
@@ -385,11 +385,10 @@ struct power_mgmt_param {
* @date 30 August 2013
* @version 1.0 Description
*/
-
-typedef struct {
+struct set_ip_addr {
u8 *au8IPAddr;
u8 idx;
-} tstrHostIFSetIPAddr;
+};
/*!
* @struct sta_inactive_t
@@ -433,7 +432,7 @@ union message_body {
struct timer_cb strTimerCb; /*!< Timer callback message body */
struct power_mgmt_param strPowerMgmtparam; /*!< Power Management message body */
struct sta_inactive_t strHostIfStaInactiveT;
- tstrHostIFSetIPAddr strHostIfSetIP;
+ struct set_ip_addr strHostIfSetIP;
tstrHostIfSetDrvHandler strHostIfSetDrvHandler;
tstrHostIFSetMulti strHostIfSetMulti;
tstrHostIfSetOperationMode strHostIfSetOperationMode;
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 22/34] staging: wilc1000: remove typedef from the struct tstrHostIfSetDrvHandler
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (19 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 21/34] staging: wilc1000: remove typedef from the struct tstrHostIFSetIPAddr Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 23/34] staging: wilc1000: remove typedef from the struct tstrHostIFSetMulti Tony Cho
` (11 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the struct tstrHostIfSetDrvHandler and
renames it to drv_handler in order to comply with the Linux coding
style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 7 ++++---
drivers/staging/wilc1000/host_interface.h | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 8b995c3..80527b5 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -433,7 +433,7 @@ union message_body {
struct power_mgmt_param strPowerMgmtparam; /*!< Power Management message body */
struct sta_inactive_t strHostIfStaInactiveT;
struct set_ip_addr strHostIfSetIP;
- tstrHostIfSetDrvHandler strHostIfSetDrvHandler;
+ struct drv_handler strHostIfSetDrvHandler;
tstrHostIFSetMulti strHostIfSetMulti;
tstrHostIfSetOperationMode strHostIfSetOperationMode;
tstrHostIfSetMacAddress strHostIfSetMacAddress;
@@ -667,14 +667,15 @@ static s32 Handle_SetChannel(tstrWILC_WFIDrv *drvHandler,
/**
* @brief Handle_SetWfiDrvHandler
* @details Sending config packet to firmware to set driver handler
- * @param[in] void * drvHandler,tstrHostIfSetDrvHandler* pstrHostIfSetDrvHandler
+ * @param[in] void * drvHandler,
+ * struct drv_handler *pstrHostIfSetDrvHandler
* @return Error code.
* @author
* @date
* @version 1.0
*/
static s32 Handle_SetWfiDrvHandler(tstrWILC_WFIDrv *drvHandler,
- tstrHostIfSetDrvHandler *pstrHostIfSetDrvHandler)
+ struct drv_handler *pstrHostIfSetDrvHandler)
{
s32 s32Error = 0;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 90493c6..a023365 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -256,9 +256,9 @@ typedef struct {
void *u32UserConnectPvoid;
} tstrWILC_UsrConnReq;
-typedef struct {
+struct drv_handler {
u32 u32Address;
-} tstrHostIfSetDrvHandler;
+};
typedef struct {
u32 u32Mode;
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 23/34] staging: wilc1000: remove typedef from the struct tstrHostIFSetMulti
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (20 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 22/34] staging: wilc1000: remove typedef from the struct tstrHostIfSetDrvHandler Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 24/34] staging: wilc1000: remove typedef from the struct tstrHostIfSetOperationMode Tony Cho
` (10 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the struct tstrHostIFSetMulti and
renames it to set_multicast in order to comply with the Linux coding
style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 80527b5..c484619 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -299,7 +299,7 @@ struct del_beacon {
};
/*!
- * @struct tstrHostIFSetMulti
+ * @struct set_multicast
* @brief set Multicast filter Address
* @details
* @todo
@@ -309,10 +309,10 @@ struct del_beacon {
* @version 1.0 Description
*/
-typedef struct {
+struct set_multicast {
bool bIsEnabled;
u32 u32count;
-} tstrHostIFSetMulti;
+};
/*!
* @struct tstrHostIFDelAllSta
@@ -434,7 +434,7 @@ union message_body {
struct sta_inactive_t strHostIfStaInactiveT;
struct set_ip_addr strHostIfSetIP;
struct drv_handler strHostIfSetDrvHandler;
- tstrHostIFSetMulti strHostIfSetMulti;
+ struct set_multicast strHostIfSetMulti;
tstrHostIfSetOperationMode strHostIfSetOperationMode;
tstrHostIfSetMacAddress strHostIfSetMacAddress;
tstrHostIfGetMacAddress strHostIfGetMacAddress;
@@ -4050,13 +4050,14 @@ static void Handle_PowerManagement(tstrWILC_WFIDrv *drvHandler,
/**
* @brief Handle_SetMulticastFilter
* @details Set Multicast filter in firmware
- * @param[in] tstrHostIFSetMulti* strHostIfSetMulti
+ * @param[in] struct set_multicast *strHostIfSetMulti
* @return NONE
* @author asobhy
* @date
* @version 1.0
*/
-static void Handle_SetMulticastFilter(tstrWILC_WFIDrv *drvHandler, tstrHostIFSetMulti *strHostIfSetMulti)
+static void Handle_SetMulticastFilter(tstrWILC_WFIDrv *drvHandler,
+ struct set_multicast *strHostIfSetMulti)
{
s32 s32Error = 0;
tstrWID strWID;
@@ -4066,7 +4067,7 @@ static void Handle_SetMulticastFilter(tstrWILC_WFIDrv *drvHandler, tstrHostIFSet
strWID.u16WIDid = (u16)WID_SETUP_MULTICAST_FILTER;
strWID.enuWIDtype = WID_BIN;
- strWID.s32ValueSize = sizeof(tstrHostIFSetMulti) + ((strHostIfSetMulti->u32count) * ETH_ALEN);
+ strWID.s32ValueSize = sizeof(struct set_multicast) + ((strHostIfSetMulti->u32count) * ETH_ALEN);
strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL);
if (strWID.ps8WidVal == NULL)
goto ERRORHANDLER;
@@ -7301,7 +7302,7 @@ s32 host_int_setup_multicast_filter(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrHostIFSetMulti *pstrMulticastFilterParam = &msg.body.strHostIfSetMulti;
+ struct set_multicast *pstrMulticastFilterParam = &msg.body.strHostIfSetMulti;
if (pstrWFIDrv == NULL) {
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 24/34] staging: wilc1000: remove typedef from the struct tstrHostIfSetOperationMode
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (21 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 23/34] staging: wilc1000: remove typedef from the struct tstrHostIFSetMulti Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 25/34] staging: wilc1000: remove typedef from the struct tstrHostIfSetMacAddress Tony Cho
` (9 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the struct tstrHostIfSetOperationMode
and renames it to op_mode in order to comply with the Linux coding
style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 5 +++--
drivers/staging/wilc1000/host_interface.h | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index c484619..1433417 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -435,7 +435,7 @@ union message_body {
struct set_ip_addr strHostIfSetIP;
struct drv_handler strHostIfSetDrvHandler;
struct set_multicast strHostIfSetMulti;
- tstrHostIfSetOperationMode strHostIfSetOperationMode;
+ struct op_mode strHostIfSetOperationMode;
tstrHostIfSetMacAddress strHostIfSetMacAddress;
tstrHostIfGetMacAddress strHostIfGetMacAddress;
tstrHostIfBASessionInfo strHostIfBASessionInfo;
@@ -715,7 +715,8 @@ static s32 Handle_SetWfiDrvHandler(tstrWILC_WFIDrv *drvHandler,
* @date
* @version 1.0
*/
-static s32 Handle_SetOperationMode(tstrWILC_WFIDrv *drvHandler, tstrHostIfSetOperationMode *pstrHostIfSetOperationMode)
+static s32 Handle_SetOperationMode(tstrWILC_WFIDrv *drvHandler,
+ struct op_mode *pstrHostIfSetOperationMode)
{
s32 s32Error = 0;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index a023365..078bb54 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -260,9 +260,9 @@ struct drv_handler {
u32 u32Address;
};
-typedef struct {
+struct op_mode {
u32 u32Mode;
-} tstrHostIfSetOperationMode;
+};
/*BugID_5077*/
typedef struct {
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 25/34] staging: wilc1000: remove typedef from the struct tstrHostIfSetMacAddress
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (22 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 24/34] staging: wilc1000: remove typedef from the struct tstrHostIfSetOperationMode Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 26/34] staging: wilc1000: remove typedef from the struct tstrHostIfGetMacAddress Tony Cho
` (8 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the struct tstrHostIfSetMacAddress and
renames it set_mac_addr in order to comply with the Linux coding style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 5 +++--
drivers/staging/wilc1000/host_interface.h | 5 ++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 1433417..756555d 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -436,7 +436,7 @@ union message_body {
struct drv_handler strHostIfSetDrvHandler;
struct set_multicast strHostIfSetMulti;
struct op_mode strHostIfSetOperationMode;
- tstrHostIfSetMacAddress strHostIfSetMacAddress;
+ struct set_mac_addr strHostIfSetMacAddress;
tstrHostIfGetMacAddress strHostIfGetMacAddress;
tstrHostIfBASessionInfo strHostIfBASessionInfo;
tstrHostIfRemainOnChan strHostIfRemainOnChan;
@@ -854,7 +854,8 @@ s32 Handle_get_IPAddress(tstrWILC_WFIDrv *drvHandler, u8 *pu8IPAddr, u8 idx)
* @date November 2013
* @version 7.0
*/
-static s32 Handle_SetMacAddress(tstrWILC_WFIDrv *drvHandler, tstrHostIfSetMacAddress *pstrHostIfSetMacAddress)
+static s32 Handle_SetMacAddress(tstrWILC_WFIDrv *drvHandler,
+ struct set_mac_addr *pstrHostIfSetMacAddress)
{
s32 s32Error = 0;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 078bb54..5ca7734 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -264,10 +264,9 @@ struct op_mode {
u32 u32Mode;
};
-/*BugID_5077*/
-typedef struct {
+struct set_mac_addr {
u8 u8MacAddress[ETH_ALEN];
-} tstrHostIfSetMacAddress;
+};
/*BugID_5213*/
typedef struct {
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 26/34] staging: wilc1000: remove typedef from the struct tstrHostIfGetMacAddress
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (23 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 25/34] staging: wilc1000: remove typedef from the struct tstrHostIfSetMacAddress Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 27/34] staging: wilc1000: remove typedef from the struct tstrHostIfBASessionInfo Tony Cho
` (7 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the struct tstrHostIfGetMacAddress and
renames it get_mac_addr in order to comply with the Linux coding style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 5 +++--
drivers/staging/wilc1000/host_interface.h | 5 ++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 756555d..86fce58 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -437,7 +437,7 @@ union message_body {
struct set_multicast strHostIfSetMulti;
struct op_mode strHostIfSetOperationMode;
struct set_mac_addr strHostIfSetMacAddress;
- tstrHostIfGetMacAddress strHostIfGetMacAddress;
+ struct get_mac_addr strHostIfGetMacAddress;
tstrHostIfBASessionInfo strHostIfBASessionInfo;
tstrHostIfRemainOnChan strHostIfRemainOnChan;
tstrHostIfRegisterFrame strHostIfRegisterFrame;
@@ -898,7 +898,8 @@ static s32 Handle_SetMacAddress(tstrWILC_WFIDrv *drvHandler,
* @date JAN 2013
* @version 8.0
*/
-static s32 Handle_GetMacAddress(tstrWILC_WFIDrv *drvHandler, tstrHostIfGetMacAddress *pstrHostIfGetMacAddress)
+static s32 Handle_GetMacAddress(tstrWILC_WFIDrv *drvHandler,
+ struct get_mac_addr *pstrHostIfGetMacAddress)
{
s32 s32Error = 0;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 5ca7734..d257183 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -268,10 +268,9 @@ struct set_mac_addr {
u8 u8MacAddress[ETH_ALEN];
};
-/*BugID_5213*/
-typedef struct {
+struct get_mac_addr {
u8 *u8MacAddress;
-} tstrHostIfGetMacAddress;
+};
/*BugID_5222*/
typedef struct {
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 27/34] staging: wilc1000: remove typedef from the struct tstrHostIfBASessionInfo
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (24 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 26/34] staging: wilc1000: remove typedef from the struct tstrHostIfGetMacAddress Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 28/34] staging: wilc1000: remove typedef from the struct tstrHostIFDelSta Tony Cho
` (6 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the struct tstrHostIfBASessionInfo and
renames it to ba_session_info in order to comply with the Linux coding
style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 17 ++++++++++-------
drivers/staging/wilc1000/host_interface.h | 5 ++---
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 86fce58..163f78e 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -438,7 +438,7 @@ union message_body {
struct op_mode strHostIfSetOperationMode;
struct set_mac_addr strHostIfSetMacAddress;
struct get_mac_addr strHostIfGetMacAddress;
- tstrHostIfBASessionInfo strHostIfBASessionInfo;
+ struct ba_session_info strHostIfBASessionInfo;
tstrHostIfRemainOnChan strHostIfRemainOnChan;
tstrHostIfRegisterFrame strHostIfRegisterFrame;
char *pUserData;
@@ -4111,7 +4111,8 @@ ERRORHANDLER:
* @date Feb. 2014
* @version 9.0
*/
-static s32 Handle_AddBASession(tstrWILC_WFIDrv *drvHandler, tstrHostIfBASessionInfo *strHostIfBASessionInfo)
+static s32 Handle_AddBASession(tstrWILC_WFIDrv *drvHandler,
+ struct ba_session_info *strHostIfBASessionInfo)
{
s32 s32Error = 0;
tstrWID strWID;
@@ -4201,7 +4202,8 @@ static s32 Handle_AddBASession(tstrWILC_WFIDrv *drvHandler, tstrHostIfBASessionI
* @date Feb. 2013
* @version 9.0
*/
-static s32 Handle_DelBASession(tstrWILC_WFIDrv *drvHandler, tstrHostIfBASessionInfo *strHostIfBASessionInfo)
+static s32 Handle_DelBASession(tstrWILC_WFIDrv *drvHandler,
+ struct ba_session_info *strHostIfBASessionInfo)
{
s32 s32Error = 0;
tstrWID strWID;
@@ -4273,7 +4275,8 @@ static s32 Handle_DelBASession(tstrWILC_WFIDrv *drvHandler, tstrHostIfBASessionI
* @date Feb. 2013
* @version 9.0
*/
-static s32 Handle_DelAllRxBASessions(tstrWILC_WFIDrv *drvHandler, tstrHostIfBASessionInfo *strHostIfBASessionInfo)
+static s32 Handle_DelAllRxBASessions(tstrWILC_WFIDrv *drvHandler,
+ struct ba_session_info *strHostIfBASessionInfo)
{
s32 s32Error = 0;
tstrWID strWID;
@@ -7572,7 +7575,7 @@ static int host_int_addBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TI
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrHostIfBASessionInfo *pBASessionInfo = &msg.body.strHostIfBASessionInfo;
+ struct ba_session_info *pBASessionInfo = &msg.body.strHostIfBASessionInfo;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -7603,7 +7606,7 @@ s32 host_int_delBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TID)
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrHostIfBASessionInfo *pBASessionInfo = &msg.body.strHostIfBASessionInfo;
+ struct ba_session_info *pBASessionInfo = &msg.body.strHostIfBASessionInfo;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -7634,7 +7637,7 @@ s32 host_int_del_All_Rx_BASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char T
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrHostIfBASessionInfo *pBASessionInfo = &msg.body.strHostIfBASessionInfo;
+ struct ba_session_info *pBASessionInfo = &msg.body.strHostIfBASessionInfo;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index d257183..9a1d3599 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -272,13 +272,12 @@ struct get_mac_addr {
u8 *u8MacAddress;
};
-/*BugID_5222*/
-typedef struct {
+struct ba_session_info {
u8 au8Bssid[ETH_ALEN];
u8 u8Ted;
u16 u16BufferSize;
u16 u16SessionTimeout;
-} tstrHostIfBASessionInfo;
+};
typedef struct {
u16 u16Channel;
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 28/34] staging: wilc1000: remove typedef from the struct tstrHostIFDelSta
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (25 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 27/34] staging: wilc1000: remove typedef from the struct tstrHostIfBASessionInfo Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 29/34] staging: wilc1000: remove typedef from the struct tstrHostIfRemainOnChan Tony Cho
` (5 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the struct tstrHostIFDelSta and renames
it del_sta in order to comply with the Linux coding style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 163f78e..8894f90 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -331,7 +331,7 @@ typedef struct {
} tstrHostIFDelAllSta;
/*!
- * @struct tstrHostIFDelSta
+ * @struct del_sta
* @brief Delete station message body
* @details
* @todo
@@ -340,10 +340,9 @@ typedef struct {
* @date 15 July 2012
* @version 1.0 Description
*/
-
-typedef struct {
+struct del_sta {
u8 au8MacAddr[ETH_ALEN];
-} tstrHostIFDelSta;
+};
/*!
* @struct timer_cb
@@ -426,7 +425,7 @@ union message_body {
struct set_beacon strHostIFSetBeacon; /*!< Set beacon message body */
struct del_beacon strHostIFDelBeacon; /*!< Del beacon message body */
struct add_sta_param strAddStaParam; /*!< Add station message body */
- tstrHostIFDelSta strDelStaParam; /*!< Del Station message body */
+ struct del_sta strDelStaParam; /*!< Del Station message body */
struct add_sta_param strEditStaParam; /*!< Edit station message body */
/* tstrScanComplete strScanComplete; / *Received Async. Scan Complete message body* / */
struct timer_cb strTimerCb; /*!< Timer callback message body */
@@ -3714,13 +3713,14 @@ ERRORHANDLER:
/**
* @brief Handle_DelStation
* @details Sending config packet to delete station
- * @param[in] tstrHostIFDelSta* pstrDelStaParam
+ * @param[in] struct del_sta *pstrDelStaParam
* @return NONE
* @author
* @date
* @version 1.0
*/
-static void Handle_DelStation(tstrWILC_WFIDrv *drvHandler, tstrHostIFDelSta *pstrDelStaParam)
+static void Handle_DelStation(tstrWILC_WFIDrv *drvHandler,
+ struct del_sta *pstrDelStaParam)
{
s32 s32Error = 0;
tstrWID strWID;
@@ -7130,7 +7130,7 @@ s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr)
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrHostIFDelSta *pstrDelStationMsg = &msg.body.strDelStaParam;
+ struct del_sta *pstrDelStationMsg = &msg.body.strDelStaParam;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 29/34] staging: wilc1000: remove typedef from the struct tstrHostIfRemainOnChan
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (26 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 28/34] staging: wilc1000: remove typedef from the struct tstrHostIFDelSta Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 30/34] staging: wilc1000: remove typedef from the struct tstrHostIfRegisterFrame Tony Cho
` (4 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the struct tstrHostIfRemainOnChan and
renames it to remain_ch in order to comply with the Linux coding style
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 8 +++++---
drivers/staging/wilc1000/host_interface.h | 6 +++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 8894f90..59b2308 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -438,7 +438,7 @@ union message_body {
struct set_mac_addr strHostIfSetMacAddress;
struct get_mac_addr strHostIfGetMacAddress;
struct ba_session_info strHostIfBASessionInfo;
- tstrHostIfRemainOnChan strHostIfRemainOnChan;
+ struct remain_ch strHostIfRemainOnChan;
tstrHostIfRegisterFrame strHostIfRegisterFrame;
char *pUserData;
tstrHostIFDelAllSta strHostIFDelAllSta;
@@ -3801,7 +3801,8 @@ ERRORHANDLER:
* @date
* @version 1.0
*/
-static int Handle_RemainOnChan(tstrWILC_WFIDrv *drvHandler, tstrHostIfRemainOnChan *pstrHostIfRemainOnChan)
+static int Handle_RemainOnChan(tstrWILC_WFIDrv *drvHandler,
+ struct remain_ch *pstrHostIfRemainOnChan)
{
s32 s32Error = 0;
u8 u8remain_on_chan_flag;
@@ -3937,7 +3938,8 @@ static int Handle_RegisterFrame(tstrWILC_WFIDrv *drvHandler, tstrHostIfRegisterF
* @version 1.0
*/
#define FALSE_FRMWR_CHANNEL 100
-static u32 Handle_ListenStateExpired(tstrWILC_WFIDrv *drvHandler, tstrHostIfRemainOnChan *pstrHostIfRemainOnChan)
+static u32 Handle_ListenStateExpired(tstrWILC_WFIDrv *drvHandler,
+ struct remain_ch *pstrHostIfRemainOnChan)
{
u8 u8remain_on_chan_flag;
tstrWID strWID;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 9a1d3599..59f83f5 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -279,14 +279,14 @@ struct ba_session_info {
u16 u16SessionTimeout;
};
-typedef struct {
+struct remain_ch {
u16 u16Channel;
u32 u32duration;
tWILCpfRemainOnChanExpired pRemainOnChanExpired;
tWILCpfRemainOnChanReady pRemainOnChanReady;
void *pVoid;
u32 u32ListenSessionID;
-} tstrHostIfRemainOnChan;
+};
typedef struct {
@@ -319,7 +319,7 @@ typedef struct {
tstrWILC_UsrConnReq strWILC_UsrConnReq;
/*Remain on channel struvture*/
- tstrHostIfRemainOnChan strHostIfRemainOnChan;
+ struct remain_ch strHostIfRemainOnChan;
u8 u8RemainOnChan_pendingreq;
u64 u64P2p_MgmtTimeout;
u8 u8P2PConnect;
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 30/34] staging: wilc1000: remove typedef from the struct tstrHostIfRegisterFrame
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (27 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 29/34] staging: wilc1000: remove typedef from the struct tstrHostIfRemainOnChan Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 31/34] staging: wilc1000: remove typedef from the struct tstrHostIFDelAllSta Tony Cho
` (3 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the struct tstrHostIfRegisterFrame and
renames it to reg_frame in order to comply with the Linux coding style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 5 +++--
drivers/staging/wilc1000/host_interface.h | 7 ++-----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 59b2308..ce4384c 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -439,7 +439,7 @@ union message_body {
struct get_mac_addr strHostIfGetMacAddress;
struct ba_session_info strHostIfBASessionInfo;
struct remain_ch strHostIfRemainOnChan;
- tstrHostIfRegisterFrame strHostIfRegisterFrame;
+ struct reg_frame strHostIfRegisterFrame;
char *pUserData;
tstrHostIFDelAllSta strHostIFDelAllSta;
};
@@ -3890,7 +3890,8 @@ ERRORHANDLER:
* @date
* @version 1.0
*/
-static int Handle_RegisterFrame(tstrWILC_WFIDrv *drvHandler, tstrHostIfRegisterFrame *pstrHostIfRegisterFrame)
+static int Handle_RegisterFrame(tstrWILC_WFIDrv *drvHandler,
+ struct reg_frame *pstrHostIfRegisterFrame)
{
s32 s32Error = 0;
tstrWID strWID;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 59f83f5..1da1d2d 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -288,14 +288,11 @@ struct remain_ch {
u32 u32ListenSessionID;
};
-typedef struct {
-
+struct reg_frame {
bool bReg;
u16 u16FrameType;
u8 u8Regid;
-
-
-} tstrHostIfRegisterFrame;
+};
#define ACTION 0xD0
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 31/34] staging: wilc1000: remove typedef from the struct tstrHostIFDelAllSta
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (28 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 30/34] staging: wilc1000: remove typedef from the struct tstrHostIfRegisterFrame Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 32/34] staging: wilc1000: remove unnecessary global variable Tony Cho
` (2 subsequent siblings)
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes typedef from the struct tstrHostIFDelAllSta and
renames it to del_all_sta in order to comply with the Linux coding
style.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index ce4384c..5d72246 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -315,7 +315,7 @@ struct set_multicast {
};
/*!
- * @struct tstrHostIFDelAllSta
+ * @struct del_all_sta
* @brief Deauth station message body
* @details
* @todo
@@ -324,11 +324,10 @@ struct set_multicast {
* @date 09 April 2014
* @version 1.0 Description
*/
-
-typedef struct {
+struct del_all_sta {
u8 au8Sta_DelAllSta[MAX_NUM_STA][ETH_ALEN];
u8 u8Num_AssocSta;
-} tstrHostIFDelAllSta;
+};
/*!
* @struct del_sta
@@ -441,7 +440,7 @@ union message_body {
struct remain_ch strHostIfRemainOnChan;
struct reg_frame strHostIfRegisterFrame;
char *pUserData;
- tstrHostIFDelAllSta strHostIFDelAllSta;
+ struct del_all_sta strHostIFDelAllSta;
};
/*!
@@ -3664,7 +3663,8 @@ ERRORHANDLER:
* @date
* @version 1.0
*/
-static void Handle_DelAllSta(tstrWILC_WFIDrv *drvHandler, tstrHostIFDelAllSta *pstrDelAllStaParam)
+static void Handle_DelAllSta(tstrWILC_WFIDrv *drvHandler,
+ struct del_all_sta *pstrDelAllStaParam)
{
s32 s32Error = 0;
@@ -7175,7 +7175,7 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN])
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrHostIFDelAllSta *pstrDelAllStationMsg = &msg.body.strHostIFDelAllSta;
+ struct del_all_sta *pstrDelAllStationMsg = &msg.body.strHostIFDelAllSta;
u8 au8Zero_Buff[ETH_ALEN] = {0};
u32 i;
u8 u8AssocNumb = 0;
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 32/34] staging: wilc1000: remove unnecessary global variable
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (29 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 31/34] staging: wilc1000: remove typedef from the struct tstrHostIFDelAllSta Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 33/34] staging: wilc1000: remove u32Intialized which is unnecessary Tony Cho
2015-09-18 9:11 ` [PATCH 34/34] staging: wilc1000: delete unnecessary comments and dead code Tony Cho
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
The global variable msgQ_created is removed because it is not necessary.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 5d72246..1be1a9c 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -6394,7 +6394,6 @@ void host_int_send_network_info_to_host
* @version 1.0
*/
static u32 u32Intialized;
-static u32 msgQ_created;
static u32 clients_count;
s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)
@@ -6468,7 +6467,6 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)
PRINT_ER("Failed to creat MQ\n");
goto _fail_;
}
- msgQ_created = 1;
HostIFthreadHandler = kthread_run(hostIFthread, NULL, "WILC_kthread");
if (IS_ERR(HostIFthreadHandler)) {
PRINT_ER("Failed to creat Thread\n");
@@ -6637,7 +6635,6 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv)
down(&hSemHostIFthrdEnd);
wilc_mq_destroy(&gMsgQHostIF);
- msgQ_created = 0;
}
down(&(pstrWFIDrv->gtOsCfgValuesSem));
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 33/34] staging: wilc1000: remove u32Intialized which is unnecessary
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (30 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 32/34] staging: wilc1000: remove unnecessary global variable Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
2015-09-18 9:11 ` [PATCH 34/34] staging: wilc1000: delete unnecessary comments and dead code Tony Cho
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
This patch removes the global variable, u32Intialized which is not
necessary from the host_interface.c file.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 1be1a9c..c87bf13 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -6393,7 +6393,6 @@ void host_int_send_network_info_to_host
* @date 8 March 2012
* @version 1.0
*/
-static u32 u32Intialized;
static u32 clients_count;
s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)
@@ -6402,12 +6401,6 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)
tstrWILC_WFIDrv *pstrWFIDrv;
int err;
- /*if(u32Intialized == 1)
- * {
- * PRINT_D(HOSTINF_DBG,"Host interface is previously initialized\n");
- * *phWFIDrv = (WILC_WFIDrvHandle)gWFiDrvHandle; //Will be adjusted later for P2P
- * return 0;
- * } */
PRINT_D(HOSTINF_DBG, "Initializing host interface for client %d\n", clients_count + 1);
gbScanWhileConnected = false;
@@ -6519,7 +6512,6 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)
goto _fail_mem_;
}
- u32Intialized = 1;
clients_count++; /* increase number of created entities */
return s32Error;
@@ -6559,12 +6551,6 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv)
/*obtain driver handle*/
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- /*if(u32Intialized == 0)
- * {
- * PRINT_ER("Host Interface is not initialized\n");
- * return 0;
- * }*/
-
/*BugID_5348*/
if (pstrWFIDrv == NULL) {
@@ -6640,7 +6626,6 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv)
down(&(pstrWFIDrv->gtOsCfgValuesSem));
/*Setting the gloabl driver handler with NULL*/
- u32Intialized = 0;
/* gWFiDrvHandle = NULL; */
ret = remove_handler_in_list(pstrWFIDrv);
if (ret)
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 34/34] staging: wilc1000: delete unnecessary comments and dead code
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
` (31 preceding siblings ...)
2015-09-18 9:11 ` [PATCH 33/34] staging: wilc1000: remove u32Intialized which is unnecessary Tony Cho
@ 2015-09-18 9:11 ` Tony Cho
32 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-18 9:11 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
The comments in union message_body are not essential and cross 80 ending
line, so they are deleted and also a dead code commented out in the union
is deleted.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index c87bf13..50cd649 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -413,22 +413,21 @@ struct sta_inactive_t {
* @version 1.0
*/
union message_body {
- struct scan_attr strHostIFscanAttr; /*!< Host IF Scan Request Attributes message body */
- struct connect_attr strHostIFconnectAttr; /*!< Host IF Connect Request Attributes message body */
- struct rcvd_net_info strRcvdNetworkInfo; /*!< Received Asynchronous Network Info message body */
- struct rcvd_async_info strRcvdGnrlAsyncInfo; /*!< Received General Asynchronous Info message body */
- struct key_attr strHostIFkeyAttr; /*!<>*/
- struct cfg_param_attr strHostIFCfgParamAttr; /*! <CFG Parameter message Body> */
+ struct scan_attr strHostIFscanAttr;
+ struct connect_attr strHostIFconnectAttr;
+ struct rcvd_net_info strRcvdNetworkInfo;
+ struct rcvd_async_info strRcvdGnrlAsyncInfo;
+ struct key_attr strHostIFkeyAttr;
+ struct cfg_param_attr strHostIFCfgParamAttr;
struct set_channel strHostIFSetChan;
struct get_channel strHostIFGetChan;
- struct set_beacon strHostIFSetBeacon; /*!< Set beacon message body */
- struct del_beacon strHostIFDelBeacon; /*!< Del beacon message body */
- struct add_sta_param strAddStaParam; /*!< Add station message body */
- struct del_sta strDelStaParam; /*!< Del Station message body */
- struct add_sta_param strEditStaParam; /*!< Edit station message body */
- /* tstrScanComplete strScanComplete; / *Received Async. Scan Complete message body* / */
- struct timer_cb strTimerCb; /*!< Timer callback message body */
- struct power_mgmt_param strPowerMgmtparam; /*!< Power Management message body */
+ struct set_beacon strHostIFSetBeacon;
+ struct del_beacon strHostIFDelBeacon;
+ struct add_sta_param strAddStaParam;
+ struct del_sta strDelStaParam;
+ struct add_sta_param strEditStaParam;
+ struct timer_cb strTimerCb;
+ struct power_mgmt_param strPowerMgmtparam;
struct sta_inactive_t strHostIfStaInactiveT;
struct set_ip_addr strHostIfSetIP;
struct drv_handler strHostIfSetDrvHandler;
--
1.9.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* Re: [PATCH 03/34] staging: wilc1000: rename strHostIFmsg
2015-09-18 9:11 ` [PATCH 03/34] staging: wilc1000: rename strHostIFmsg Tony Cho
@ 2015-09-19 3:00 ` Greg KH
2015-09-21 1:53 ` Tony Cho
0 siblings, 1 reply; 36+ messages in thread
From: Greg KH @ 2015-09-19 3:00 UTC (permalink / raw)
To: Tony Cho
Cc: devel, rachel.kim, chris.park, austin.shin, linux-wireless,
johnny.kim, Nicolas.FERRE, adel.noureldin, leo.kim,
adham.abozaeid
On Fri, Sep 18, 2015 at 06:11:05PM +0900, Tony Cho wrote:
> This patch changes the name, strHostIFmsg simply to msg because the
> camelcase notation is not recommended in Linux.
>
> Signed-off-by: Tony Cho <tony.cho@atmel.com>
Because of the other patches I didn't accept, and I think because of
patches that community members sent in, this patch doesn't apply
(patches 1 and 2 I had to do by hand, but I don't want to keep doing
that...)
So can you rebase this series on my staging-testing branch and resend
them?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 03/34] staging: wilc1000: rename strHostIFmsg
2015-09-19 3:00 ` Greg KH
@ 2015-09-21 1:53 ` Tony Cho
0 siblings, 0 replies; 36+ messages in thread
From: Tony Cho @ 2015-09-21 1:53 UTC (permalink / raw)
To: Greg KH
Cc: devel, rachel.kim, chris.park, austin.shin, linux-wireless,
johnny.kim, Nicolas.FERRE, adel.noureldin, leo.kim,
adham.abozaeid
On 2015년 09월 19일 12:00, Greg KH wrote:
> On Fri, Sep 18, 2015 at 06:11:05PM +0900, Tony Cho wrote:
>> This patch changes the name, strHostIFmsg simply to msg because the
>> camelcase notation is not recommended in Linux.
>>
>> Signed-off-by: Tony Cho <tony.cho@atmel.com>
> Because of the other patches I didn't accept, and I think because of
> patches that community members sent in, this patch doesn't apply
> (patches 1 and 2 I had to do by hand, but I don't want to keep doing
> that...)
>
> So can you rebase this series on my staging-testing branch and resend
> them?
Sure, I will resend them to you.
Thanks,
Tony.
> thanks,
>
> greg k-h
^ permalink raw reply [flat|nested] 36+ messages in thread
end of thread, other threads:[~2015-09-21 1:54 UTC | newest]
Thread overview: 36+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-18 9:11 [PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg Tony Cho
2015-09-18 9:11 ` [PATCH 02/34] staging: wilc1000: remove typedef from the struct Tony Cho
2015-09-18 9:11 ` [PATCH 03/34] staging: wilc1000: rename strHostIFmsg Tony Cho
2015-09-19 3:00 ` Greg KH
2015-09-21 1:53 ` Tony Cho
2015-09-18 9:11 ` [PATCH 04/34] staging: wilc1000: rename u16MsgId Tony Cho
2015-09-18 9:11 ` [PATCH 05/34] staging: wilc1000 remove typedef from the union Tony Cho
2015-09-18 9:11 ` [PATCH 06/34] staging: wilc1000: rename uniHostIFmsgBody Tony Cho
2015-09-18 9:11 ` [PATCH 07/34] staging: wilc1000: remove typedef from the struct tstrHostIFscanAttr Tony Cho
2015-09-18 9:11 ` [PATCH 08/34] staging: wilc1000: remove typedef from the struct tstrHostIFconnectAttr Tony Cho
2015-09-18 9:11 ` [PATCH 09/34] staging: wilc1000: remove typedef from the struct tstrRcvdNetworkInfo Tony Cho
2015-09-18 9:11 ` [PATCH 10/34] staging: wilc1000: remove typedef from the struct tstrRcvdGnrlAsyncInfo Tony Cho
2015-09-18 9:11 ` [PATCH 11/34] staging: wilc1000: remove typedef from the struct tstrHostIFkeyAttr Tony Cho
2015-09-18 9:11 ` [PATCH 12/34] staging: wilc1000: remove typedef from the struct tstrHostIFCfgParamAttr Tony Cho
2015-09-18 9:11 ` [PATCH 13/34] staging: wilc1000: remove typedef from the struct tstrHostIFSetChan Tony Cho
2015-09-18 9:11 ` [PATCH 14/34] staging: wilc1000: remove typedef from the struct tstrHostIFGetChan Tony Cho
2015-09-18 9:11 ` [PATCH 15/34] staging: wilc1000: remove typedef from the struct tstrHostIFSetBeacon Tony Cho
2015-09-18 9:11 ` [PATCH 16/34] staging: wilc1000: remove typedef from the struct tstrHostIFDelBeacon Tony Cho
2015-09-18 9:11 ` [PATCH 17/34] staging: wilc1000: remove typedef from the struct tstrWILC_AddStaParam Tony Cho
2015-09-18 9:11 ` [PATCH 18/34] staging: wilc1000: remove typedef from the struct tstrTimerCb Tony Cho
2015-09-18 9:11 ` [PATCH 19/34] staging: wilc1000: remove typedef from the struct tstrHostIfPowerMgmtParam Tony Cho
2015-09-18 9:11 ` [PATCH 20/34] staging: wilc1000: remove typedef from the struct tstrHostIfStaInactiveT Tony Cho
2015-09-18 9:11 ` [PATCH 21/34] staging: wilc1000: remove typedef from the struct tstrHostIFSetIPAddr Tony Cho
2015-09-18 9:11 ` [PATCH 22/34] staging: wilc1000: remove typedef from the struct tstrHostIfSetDrvHandler Tony Cho
2015-09-18 9:11 ` [PATCH 23/34] staging: wilc1000: remove typedef from the struct tstrHostIFSetMulti Tony Cho
2015-09-18 9:11 ` [PATCH 24/34] staging: wilc1000: remove typedef from the struct tstrHostIfSetOperationMode Tony Cho
2015-09-18 9:11 ` [PATCH 25/34] staging: wilc1000: remove typedef from the struct tstrHostIfSetMacAddress Tony Cho
2015-09-18 9:11 ` [PATCH 26/34] staging: wilc1000: remove typedef from the struct tstrHostIfGetMacAddress Tony Cho
2015-09-18 9:11 ` [PATCH 27/34] staging: wilc1000: remove typedef from the struct tstrHostIfBASessionInfo Tony Cho
2015-09-18 9:11 ` [PATCH 28/34] staging: wilc1000: remove typedef from the struct tstrHostIFDelSta Tony Cho
2015-09-18 9:11 ` [PATCH 29/34] staging: wilc1000: remove typedef from the struct tstrHostIfRemainOnChan Tony Cho
2015-09-18 9:11 ` [PATCH 30/34] staging: wilc1000: remove typedef from the struct tstrHostIfRegisterFrame Tony Cho
2015-09-18 9:11 ` [PATCH 31/34] staging: wilc1000: remove typedef from the struct tstrHostIFDelAllSta Tony Cho
2015-09-18 9:11 ` [PATCH 32/34] staging: wilc1000: remove unnecessary global variable Tony Cho
2015-09-18 9:11 ` [PATCH 33/34] staging: wilc1000: remove u32Intialized which is unnecessary Tony Cho
2015-09-18 9:11 ` [PATCH 34/34] staging: wilc1000: delete unnecessary comments and dead code Tony Cho
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.