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

staging: wilc1000: rename u8RemainOnChan_pendingreq of struct host_if_drv

This patch renames u8RemainOnChan_pendingreq of struct host_if_drv to
remain_on_ch_pending to avoid CamelCase naming convention.
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d61f8e1e
...@@ -2476,7 +2476,7 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv, ...@@ -2476,7 +2476,7 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv,
u8 u8remain_on_chan_flag; u8 u8remain_on_chan_flag;
struct wid wid; struct wid wid;
if (!hif_drv->u8RemainOnChan_pendingreq) { if (!hif_drv->remain_on_ch_pending) {
hif_drv->remain_on_ch.pVoid = pstrHostIfRemainOnChan->pVoid; hif_drv->remain_on_ch.pVoid = pstrHostIfRemainOnChan->pVoid;
hif_drv->remain_on_ch.pRemainOnChanExpired = pstrHostIfRemainOnChan->pRemainOnChanExpired; hif_drv->remain_on_ch.pRemainOnChanExpired = pstrHostIfRemainOnChan->pRemainOnChanExpired;
hif_drv->remain_on_ch.pRemainOnChanReady = pstrHostIfRemainOnChan->pRemainOnChanReady; hif_drv->remain_on_ch.pRemainOnChanReady = pstrHostIfRemainOnChan->pRemainOnChanReady;
...@@ -2488,7 +2488,7 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv, ...@@ -2488,7 +2488,7 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv,
if (hif_drv->usr_scan_req.pfUserScanResult) { if (hif_drv->usr_scan_req.pfUserScanResult) {
PRINT_INFO(GENERIC_DBG, "Required to remain on chan while scanning return\n"); PRINT_INFO(GENERIC_DBG, "Required to remain on chan while scanning return\n");
hif_drv->u8RemainOnChan_pendingreq = 1; hif_drv->remain_on_ch_pending = 1;
result = -EBUSY; result = -EBUSY;
goto ERRORHANDLER; goto ERRORHANDLER;
} }
...@@ -2535,8 +2535,8 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv, ...@@ -2535,8 +2535,8 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv,
if (hif_drv->remain_on_ch.pRemainOnChanReady) if (hif_drv->remain_on_ch.pRemainOnChanReady)
hif_drv->remain_on_ch.pRemainOnChanReady(hif_drv->remain_on_ch.pVoid); hif_drv->remain_on_ch.pRemainOnChanReady(hif_drv->remain_on_ch.pVoid);
if (hif_drv->u8RemainOnChan_pendingreq) if (hif_drv->remain_on_ch_pending)
hif_drv->u8RemainOnChan_pendingreq = 0; hif_drv->remain_on_ch_pending = 0;
} }
return result; return result;
...@@ -2886,7 +2886,7 @@ static int hostIFthread(void *pvArg) ...@@ -2886,7 +2886,7 @@ static int hostIFthread(void *pvArg)
Handle_ScanDone(msg.drv, SCAN_EVENT_DONE); Handle_ScanDone(msg.drv, SCAN_EVENT_DONE);
if (hif_drv->u8RemainOnChan_pendingreq) if (hif_drv->remain_on_ch_pending)
Handle_RemainOnChan(msg.drv, &msg.body.remain_on_ch); Handle_RemainOnChan(msg.drv, &msg.body.remain_on_ch);
break; break;
......
...@@ -295,7 +295,7 @@ struct host_if_drv { ...@@ -295,7 +295,7 @@ struct host_if_drv {
struct user_scan_req usr_scan_req; struct user_scan_req usr_scan_req;
struct user_conn_req usr_conn_req; struct user_conn_req usr_conn_req;
struct remain_ch remain_on_ch; struct remain_ch remain_on_ch;
u8 u8RemainOnChan_pendingreq; u8 remain_on_ch_pending;
u64 u64P2p_MgmtTimeout; u64 u64P2p_MgmtTimeout;
u8 u8P2PConnect; u8 u8P2PConnect;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment