* [PATCH 24/32] staging: wilc1000: rename strHostIfSetOperationMode
2015-09-30 9:55 [PATCH 23/32] staging: wilc1000: rename strHostIfSetMulti Tony Cho
@ 2015-09-30 9:55 ` Tony Cho
2015-09-30 9:55 ` [PATCH 25/32] staging: wilc1000: rename strHostIfSetMacAddress Tony Cho
` (7 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Tony Cho @ 2015-09-30 9:55 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 renames strHostIfSetOperationMode to mode to avoid CamelCase
naming convention.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 034e3d9..a66f78d 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -386,7 +386,7 @@ union message_body {
struct set_ip_addr ip_info;
struct drv_handler drv;
struct set_multicast multicast_info;
- struct op_mode strHostIfSetOperationMode;
+ struct op_mode mode;
struct set_mac_addr strHostIfSetMacAddress;
struct get_mac_addr strHostIfGetMacAddress;
struct ba_session_info strHostIfBASessionInfo;
@@ -4163,7 +4163,7 @@ static int hostIFthread(void *pvArg)
break;
case HOST_IF_MSG_SET_OPERATION_MODE:
- Handle_SetOperationMode(msg.drvHandler, &msg.body.strHostIfSetOperationMode);
+ Handle_SetOperationMode(msg.drvHandler, &msg.body.mode);
break;
case HOST_IF_MSG_SET_IPADDRESS:
@@ -5407,7 +5407,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.body.strHostIfSetOperationMode.u32Mode = u32mode;
+ msg.body.mode.u32Mode = u32mode;
msg.drvHandler = hWFIDrv;
s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 25/32] staging: wilc1000: rename strHostIfSetMacAddress
2015-09-30 9:55 [PATCH 23/32] staging: wilc1000: rename strHostIfSetMulti Tony Cho
2015-09-30 9:55 ` [PATCH 24/32] staging: wilc1000: rename strHostIfSetOperationMode Tony Cho
@ 2015-09-30 9:55 ` Tony Cho
2015-09-30 9:55 ` [PATCH 26/32] staging: wilc1000: rename strHostIfGetMacAddress Tony Cho
` (6 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Tony Cho @ 2015-09-30 9:55 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 renames strHostIfSetMacAddress to set_mac_info to avoid
CamelCase naming convention.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index a66f78d..2fa1158 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -387,7 +387,7 @@ union message_body {
struct drv_handler drv;
struct set_multicast multicast_info;
struct op_mode mode;
- struct set_mac_addr strHostIfSetMacAddress;
+ struct set_mac_addr set_mac_info;
struct get_mac_addr strHostIfGetMacAddress;
struct ba_session_info strHostIfBASessionInfo;
struct remain_ch strHostIfRemainOnChan;
@@ -4177,7 +4177,7 @@ static int hostIFthread(void *pvArg)
break;
case HOST_IF_MSG_SET_MAC_ADDRESS:
- Handle_SetMacAddress(msg.drvHandler, &msg.body.strHostIfSetMacAddress);
+ Handle_SetMacAddress(msg.drvHandler, &msg.body.set_mac_info);
break;
case HOST_IF_MSG_GET_MAC_ADDRESS:
@@ -4892,7 +4892,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.body.strHostIfSetMacAddress.u8MacAddress, pu8MacAddress, ETH_ALEN);
+ memcpy(msg.body.set_mac_info.u8MacAddress, pu8MacAddress, ETH_ALEN);
msg.drvHandler = hWFIDrv;
s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 26/32] staging: wilc1000: rename strHostIfGetMacAddress
2015-09-30 9:55 [PATCH 23/32] staging: wilc1000: rename strHostIfSetMulti Tony Cho
2015-09-30 9:55 ` [PATCH 24/32] staging: wilc1000: rename strHostIfSetOperationMode Tony Cho
2015-09-30 9:55 ` [PATCH 25/32] staging: wilc1000: rename strHostIfSetMacAddress Tony Cho
@ 2015-09-30 9:55 ` Tony Cho
2015-09-30 9:55 ` [PATCH 27/32] staging: wilc1000: rename strHostIfBASessionInfo Tony Cho
` (5 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Tony Cho @ 2015-09-30 9:55 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 renames strHostIfGetMacAddress to get_mac_info to avoid
CamelCase naming convention.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 2fa1158..a6702dd 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -388,7 +388,7 @@ union message_body {
struct set_multicast multicast_info;
struct op_mode mode;
struct set_mac_addr set_mac_info;
- struct get_mac_addr strHostIfGetMacAddress;
+ struct get_mac_addr get_mac_info;
struct ba_session_info strHostIfBASessionInfo;
struct remain_ch strHostIfRemainOnChan;
struct reg_frame strHostIfRegisterFrame;
@@ -4181,7 +4181,7 @@ static int hostIFthread(void *pvArg)
break;
case HOST_IF_MSG_GET_MAC_ADDRESS:
- Handle_GetMacAddress(msg.drvHandler, &msg.body.strHostIfGetMacAddress);
+ Handle_GetMacAddress(msg.drvHandler, &msg.body.get_mac_info);
break;
case HOST_IF_MSG_REMAIN_ON_CHAN:
@@ -4858,7 +4858,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.body.strHostIfGetMacAddress.u8MacAddress = pu8MacAddress;
+ msg.body.get_mac_info.u8MacAddress = pu8MacAddress;
msg.drvHandler = hWFIDrv;
/* send the message */
s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 27/32] staging: wilc1000: rename strHostIfBASessionInfo
2015-09-30 9:55 [PATCH 23/32] staging: wilc1000: rename strHostIfSetMulti Tony Cho
` (2 preceding siblings ...)
2015-09-30 9:55 ` [PATCH 26/32] staging: wilc1000: rename strHostIfGetMacAddress Tony Cho
@ 2015-09-30 9:55 ` Tony Cho
2015-09-30 9:55 ` [PATCH 28/32] staging: wilc1000: rename strHostIfRemainOnChan Tony Cho
` (4 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Tony Cho @ 2015-09-30 9:55 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 renames strHostIfBASessionInfo to session_info to avoid
CamelCase naming convention.
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 a6702dd..b7797a5 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -389,7 +389,7 @@ union message_body {
struct op_mode mode;
struct set_mac_addr set_mac_info;
struct get_mac_addr get_mac_info;
- struct ba_session_info strHostIfBASessionInfo;
+ struct ba_session_info session_info;
struct remain_ch strHostIfRemainOnChan;
struct reg_frame strHostIfRegisterFrame;
char *pUserData;
@@ -4204,11 +4204,11 @@ static int hostIFthread(void *pvArg)
break;
case HOST_IF_MSG_ADD_BA_SESSION:
- Handle_AddBASession(msg.drvHandler, &msg.body.strHostIfBASessionInfo);
+ Handle_AddBASession(msg.drvHandler, &msg.body.session_info);
break;
case HOST_IF_MSG_DEL_ALL_RX_BA_SESSIONS:
- Handle_DelAllRxBASessions(msg.drvHandler, &msg.body.strHostIfBASessionInfo);
+ Handle_DelAllRxBASessions(msg.drvHandler, &msg.body.session_info);
break;
case HOST_IF_MSG_DEL_ALL_STA:
@@ -7119,7 +7119,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;
- struct ba_session_info *pBASessionInfo = &msg.body.strHostIfBASessionInfo;
+ struct ba_session_info *pBASessionInfo = &msg.body.session_info;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -7150,7 +7150,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;
- struct ba_session_info *pBASessionInfo = &msg.body.strHostIfBASessionInfo;
+ struct ba_session_info *pBASessionInfo = &msg.body.session_info;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -7180,7 +7180,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;
- struct ba_session_info *pBASessionInfo = &msg.body.strHostIfBASessionInfo;
+ struct ba_session_info *pBASessionInfo = &msg.body.session_info;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 28/32] staging: wilc1000: rename strHostIfRemainOnChan
2015-09-30 9:55 [PATCH 23/32] staging: wilc1000: rename strHostIfSetMulti Tony Cho
` (3 preceding siblings ...)
2015-09-30 9:55 ` [PATCH 27/32] staging: wilc1000: rename strHostIfBASessionInfo Tony Cho
@ 2015-09-30 9:55 ` Tony Cho
2015-09-30 9:55 ` [PATCH 29/32] staging: wilc1000: rename strHostIfRegisterFrame Tony Cho
` (3 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Tony Cho @ 2015-09-30 9:55 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 renames strHostIfRemainOnChan to remain_on_ch to avoid
CamelCase naming convention.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index b7797a5..9dac906 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -390,7 +390,7 @@ union message_body {
struct set_mac_addr set_mac_info;
struct get_mac_addr get_mac_info;
struct ba_session_info session_info;
- struct remain_ch strHostIfRemainOnChan;
+ struct remain_ch remain_on_ch;
struct reg_frame strHostIfRegisterFrame;
char *pUserData;
struct del_all_sta strHostIFDelAllSta;
@@ -3693,7 +3693,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.body.strHostIfRemainOnChan.u32ListenSessionID = pstrWFIDrv->strHostIfRemainOnChan.u32ListenSessionID;
+ msg.body.remain_on_ch.u32ListenSessionID = pstrWFIDrv->strHostIfRemainOnChan.u32ListenSessionID;
/* send the message */
s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
@@ -4098,7 +4098,7 @@ static int hostIFthread(void *pvArg)
Handle_ScanDone(msg.drvHandler, SCAN_EVENT_DONE);
if (pstrWFIDrv->u8RemainOnChan_pendingreq)
- Handle_RemainOnChan(msg.drvHandler, &msg.body.strHostIfRemainOnChan);
+ Handle_RemainOnChan(msg.drvHandler, &msg.body.remain_on_ch);
break;
@@ -4186,7 +4186,7 @@ static int hostIFthread(void *pvArg)
case HOST_IF_MSG_REMAIN_ON_CHAN:
PRINT_D(HOSTINF_DBG, "HOST_IF_MSG_REMAIN_ON_CHAN\n");
- Handle_RemainOnChan(msg.drvHandler, &msg.body.strHostIfRemainOnChan);
+ Handle_RemainOnChan(msg.drvHandler, &msg.body.remain_on_ch);
break;
case HOST_IF_MSG_REGISTER_FRAME:
@@ -4195,7 +4195,7 @@ static int hostIFthread(void *pvArg)
break;
case HOST_IF_MSG_LISTEN_TIMER_FIRED:
- Handle_ListenStateExpired(msg.drvHandler, &msg.body.strHostIfRemainOnChan);
+ Handle_ListenStateExpired(msg.drvHandler, &msg.body.remain_on_ch);
break;
case HOST_IF_MSG_SET_MULTICAST_FILTER:
@@ -6407,12 +6407,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.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.body.remain_on_ch.u16Channel = chan;
+ msg.body.remain_on_ch.pRemainOnChanExpired = RemainOnChanExpired;
+ msg.body.remain_on_ch.pRemainOnChanReady = RemainOnChanReady;
+ msg.body.remain_on_ch.pVoid = pvUserArg;
+ msg.body.remain_on_ch.u32duration = u32duration;
+ msg.body.remain_on_ch.u32ListenSessionID = u32SessionID;
msg.drvHandler = hWFIDrv;
s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
@@ -6454,7 +6454,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.body.strHostIfRemainOnChan.u32ListenSessionID = u32SessionID;
+ msg.body.remain_on_ch.u32ListenSessionID = u32SessionID;
s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 29/32] staging: wilc1000: rename strHostIfRegisterFrame
2015-09-30 9:55 [PATCH 23/32] staging: wilc1000: rename strHostIfSetMulti Tony Cho
` (4 preceding siblings ...)
2015-09-30 9:55 ` [PATCH 28/32] staging: wilc1000: rename strHostIfRemainOnChan Tony Cho
@ 2015-09-30 9:55 ` Tony Cho
2015-09-30 11:00 ` Dan Carpenter
2015-09-30 9:55 ` [PATCH 30/32] staging: wilc1000: rename pUserData Tony Cho
` (2 subsequent siblings)
8 siblings, 1 reply; 13+ messages in thread
From: Tony Cho @ 2015-09-30 9:55 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 renames strHostIfRegisterFrame to reg_f to avoid CamelCase
naming convention.
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 9dac906..79957f9 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -391,7 +391,7 @@ union message_body {
struct get_mac_addr get_mac_info;
struct ba_session_info session_info;
struct remain_ch remain_on_ch;
- struct reg_frame strHostIfRegisterFrame;
+ struct reg_frame reg_f;
char *pUserData;
struct del_all_sta strHostIFDelAllSta;
};
@@ -4191,7 +4191,7 @@ static int hostIFthread(void *pvArg)
case HOST_IF_MSG_REGISTER_FRAME:
PRINT_D(HOSTINF_DBG, "HOST_IF_MSG_REGISTER_FRAME\n");
- Handle_RegisterFrame(msg.drvHandler, &msg.body.strHostIfRegisterFrame);
+ Handle_RegisterFrame(msg.drvHandler, &msg.body.reg_f);
break;
case HOST_IF_MSG_LISTEN_TIMER_FIRED:
@@ -6489,20 +6489,20 @@ s32 host_int_frame_register(tstrWILC_WFIDrv *hWFIDrv, u16 u16FrameType, bool bRe
switch (u16FrameType) {
case ACTION:
PRINT_D(HOSTINF_DBG, "ACTION\n");
- msg.body.strHostIfRegisterFrame.u8Regid = ACTION_FRM_IDX;
+ msg.body.reg_f.u8Regid = ACTION_FRM_IDX;
break;
case PROBE_REQ:
PRINT_D(HOSTINF_DBG, "PROBE REQ\n");
- msg.body.strHostIfRegisterFrame.u8Regid = PROBE_REQ_IDX;
+ msg.body.reg_f.u8Regid = PROBE_REQ_IDX;
break;
default:
PRINT_D(HOSTINF_DBG, "Not valid frame type\n");
break;
}
- msg.body.strHostIfRegisterFrame.u16FrameType = u16FrameType;
- msg.body.strHostIfRegisterFrame.bReg = bReg;
+ msg.body.reg_f.u16FrameType = u16FrameType;
+ msg.body.reg_f.bReg = bReg;
msg.drvHandler = hWFIDrv;
s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 29/32] staging: wilc1000: rename strHostIfRegisterFrame
2015-09-30 9:55 ` [PATCH 29/32] staging: wilc1000: rename strHostIfRegisterFrame Tony Cho
@ 2015-09-30 11:00 ` Dan Carpenter
0 siblings, 0 replies; 13+ messages in thread
From: Dan Carpenter @ 2015-09-30 11:00 UTC (permalink / raw)
To: Tony Cho
Cc: gregkh, devel, rachel.kim, chris.park, austin.shin,
linux-wireless, johnny.kim, Nicolas.FERRE, adel.noureldin,
leo.kim, adham.abozaeid
On Wed, Sep 30, 2015 at 06:55:11PM +0900, Tony Cho wrote:
> This patch renames strHostIfRegisterFrame to reg_f to avoid CamelCase
> naming convention.
Could we go with "reg_frame"? f is very ambigous.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 30/32] staging: wilc1000: rename pUserData
2015-09-30 9:55 [PATCH 23/32] staging: wilc1000: rename strHostIfSetMulti Tony Cho
` (5 preceding siblings ...)
2015-09-30 9:55 ` [PATCH 29/32] staging: wilc1000: rename strHostIfRegisterFrame Tony Cho
@ 2015-09-30 9:55 ` Tony Cho
2015-09-30 9:55 ` [PATCH 31/32] staging: wilc1000: rename strHostIFDelAllSta Tony Cho
2015-09-30 9:55 ` [PATCH 32/32] staging: wilc1000: fix kernel fail after ifconfig wlan0 up Tony Cho
8 siblings, 0 replies; 13+ messages in thread
From: Tony Cho @ 2015-09-30 9:55 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 renames pUserData to data to avoid CamelCase naming
convention.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 79957f9..3769595 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -392,7 +392,7 @@ union message_body {
struct ba_session_info session_info;
struct remain_ch remain_on_ch;
struct reg_frame reg_f;
- char *pUserData;
+ char *data;
struct del_all_sta strHostIFDelAllSta;
};
@@ -4111,7 +4111,7 @@ static int hostIFthread(void *pvArg)
break;
case HOST_IF_MSG_GET_STATISTICS:
- Handle_GetStatistics(msg.drvHandler, (tstrStatistics *)msg.body.pUserData);
+ Handle_GetStatistics(msg.drvHandler, (tstrStatistics *)msg.body.data);
break;
case HOST_IF_MSG_GET_CHNL:
@@ -5689,7 +5689,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.body.pUserData = (char *)pstrStatistics;
+ msg.body.data = (char *)pstrStatistics;
msg.drvHandler = hWFIDrv;
/* send the message */
s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 31/32] staging: wilc1000: rename strHostIFDelAllSta
2015-09-30 9:55 [PATCH 23/32] staging: wilc1000: rename strHostIfSetMulti Tony Cho
` (6 preceding siblings ...)
2015-09-30 9:55 ` [PATCH 30/32] staging: wilc1000: rename pUserData Tony Cho
@ 2015-09-30 9:55 ` Tony Cho
2015-09-30 9:55 ` [PATCH 32/32] staging: wilc1000: fix kernel fail after ifconfig wlan0 up Tony Cho
8 siblings, 0 replies; 13+ messages in thread
From: Tony Cho @ 2015-09-30 9:55 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 renames strHostIFDelAllSta to del_all_sta_info to avoid
CamelCase naming convention.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 3769595..aad0f5d 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -393,7 +393,7 @@ union message_body {
struct remain_ch remain_on_ch;
struct reg_frame reg_f;
char *data;
- struct del_all_sta strHostIFDelAllSta;
+ struct del_all_sta del_all_sta_info;
};
/*!
@@ -4212,7 +4212,7 @@ static int hostIFthread(void *pvArg)
break;
case HOST_IF_MSG_DEL_ALL_STA:
- Handle_DelAllSta(msg.drvHandler, &msg.body.strHostIFDelAllSta);
+ Handle_DelAllSta(msg.drvHandler, &msg.body.del_all_sta_info);
break;
default:
@@ -6726,7 +6726,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;
- struct del_all_sta *pstrDelAllStationMsg = &msg.body.strHostIFDelAllSta;
+ struct del_all_sta *pstrDelAllStationMsg = &msg.body.del_all_sta_info;
u8 au8Zero_Buff[ETH_ALEN] = {0};
u32 i;
u8 u8AssocNumb = 0;
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 32/32] staging: wilc1000: fix kernel fail after ifconfig wlan0 up
2015-09-30 9:55 [PATCH 23/32] staging: wilc1000: rename strHostIfSetMulti Tony Cho
` (7 preceding siblings ...)
2015-09-30 9:55 ` [PATCH 31/32] staging: wilc1000: rename strHostIFDelAllSta Tony Cho
@ 2015-09-30 9:55 ` Tony Cho
2015-09-30 10:05 ` Dan Carpenter
8 siblings, 1 reply; 13+ messages in thread
From: Tony Cho @ 2015-09-30 9:55 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
From: Leo Kim <leo.kim@atmel.com>
This patch fix kernel fail after ifconfig wlan0 up.
- if normal operation, kfree functions don't execute.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/wilc_msgqueue.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_msgqueue.c b/drivers/staging/wilc1000/wilc_msgqueue.c
index d5ebd6d..f412121 100644
--- a/drivers/staging/wilc1000/wilc_msgqueue.c
+++ b/drivers/staging/wilc1000/wilc_msgqueue.c
@@ -76,8 +76,10 @@ int wilc_mq_send(WILC_MsgQueueHandle *pHandle,
/* construct a new message */
pstrMessage = kmalloc(sizeof(Message), GFP_ATOMIC);
- if (!pstrMessage)
- return -ENOMEM;
+ if (!pstrMessage) {
+ result = -ENOMEM;
+ goto ERRORHANDLER;
+ }
pstrMessage->u32Length = u32SendBufferSize;
pstrMessage->pstrNext = NULL;
pstrMessage->pvBuffer = kmalloc(u32SendBufferSize, GFP_ATOMIC);
@@ -104,10 +106,12 @@ int wilc_mq_send(WILC_MsgQueueHandle *pHandle,
up(&pHandle->hSem);
ERRORHANDLER:
- /* error occured, free any allocations */
- if (pstrMessage) {
- kfree(pstrMessage->pvBuffer);
- kfree(pstrMessage);
+ if (result) {
+ /* error occured, free any allocations */
+ if (pstrMessage) {
+ kfree(pstrMessage->pvBuffer);
+ kfree(pstrMessage);
+ }
}
return result;
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 32/32] staging: wilc1000: fix kernel fail after ifconfig wlan0 up
2015-09-30 9:55 ` [PATCH 32/32] staging: wilc1000: fix kernel fail after ifconfig wlan0 up Tony Cho
@ 2015-09-30 10:05 ` Dan Carpenter
2015-09-30 12:21 ` Kim, Leo
0 siblings, 1 reply; 13+ messages in thread
From: Dan Carpenter @ 2015-09-30 10:05 UTC (permalink / raw)
To: Tony Cho
Cc: gregkh, devel, rachel.kim, chris.park, austin.shin,
linux-wireless, johnny.kim, Nicolas.FERRE, adel.noureldin,
leo.kim, adham.abozaeid
Ugh... No. Just do this:
diff --git a/drivers/staging/wilc1000/wilc_msgqueue.c b/drivers/staging/wilc1000/wilc_msgqueue.c
index 869736a..52d8f95 100644
--- a/drivers/staging/wilc1000/wilc_msgqueue.c
+++ b/drivers/staging/wilc1000/wilc_msgqueue.c
@@ -102,6 +102,8 @@ int wilc_mq_send(WILC_MsgQueueHandle *pHandle,
up(&pHandle->hSem);
+ return 0;
+
ERRORHANDLER:
/* error occured, free any allocations */
if (pstrMessage) {
^ permalink raw reply related [flat|nested] 13+ messages in thread* RE: [PATCH 32/32] staging: wilc1000: fix kernel fail after ifconfig wlan0 up
2015-09-30 10:05 ` Dan Carpenter
@ 2015-09-30 12:21 ` Kim, Leo
0 siblings, 0 replies; 13+ messages in thread
From: Kim, Leo @ 2015-09-30 12:21 UTC (permalink / raw)
To: Dan Carpenter, Cho, Tony
Cc: gregkh@linuxfoundation.org, devel@driverdev.osuosl.org,
Kim, Rachel, Park, Chris, Shin, Austin,
linux-wireless@vger.kernel.org, Kim, Johnny, Ferre, Nicolas,
Noureldin, Adel, Abozaeid, Adham
Dear Dan,
Thank you!
Always helpful your advice listen carefully.
I will send in the morning.
Thanks, BR
Leo
-----Original Message-----
From: Dan Carpenter [mailto:dan.carpenter@oracle.com]
Sent: Wednesday, September 30, 2015 7:05 PM
To: Cho, Tony
Cc: gregkh@linuxfoundation.org; devel@driverdev.osuosl.org; Kim, Rachel; Park, Chris; Shin, Austin; linux-wireless@vger.kernel.org; Kim, Johnny; Ferre, Nicolas; Noureldin, Adel; Kim, Leo; Abozaeid, Adham
Subject: Re: [PATCH 32/32] staging: wilc1000: fix kernel fail after ifconfig wlan0 up
Ugh... No. Just do this:
diff --git a/drivers/staging/wilc1000/wilc_msgqueue.c b/drivers/staging/wilc1000/wilc_msgqueue.c
index 869736a..52d8f95 100644
--- a/drivers/staging/wilc1000/wilc_msgqueue.c
+++ b/drivers/staging/wilc1000/wilc_msgqueue.c
@@ -102,6 +102,8 @@ int wilc_mq_send(WILC_MsgQueueHandle *pHandle,
up(&pHandle->hSem);
+ return 0;
+
ERRORHANDLER:
/* error occured, free any allocations */
if (pstrMessage) {
^ permalink raw reply related [flat|nested] 13+ messages in thread