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

staging: wilc1000: rename u16Channel of struct remain_ch

This patch renames u16Channel of struct remain_ch to ch
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 bcb410bb
...@@ -2483,10 +2483,10 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv, ...@@ -2483,10 +2483,10 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv,
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;
hif_drv->remain_on_ch.u16Channel = pstrHostIfRemainOnChan->u16Channel; hif_drv->remain_on_ch.ch = pstrHostIfRemainOnChan->ch;
hif_drv->remain_on_ch.u32ListenSessionID = pstrHostIfRemainOnChan->u32ListenSessionID; hif_drv->remain_on_ch.u32ListenSessionID = pstrHostIfRemainOnChan->u32ListenSessionID;
} else { } else {
pstrHostIfRemainOnChan->u16Channel = hif_drv->remain_on_ch.u16Channel; pstrHostIfRemainOnChan->ch = hif_drv->remain_on_ch.ch;
} }
if (hif_drv->usr_scan_req.pfUserScanResult) { if (hif_drv->usr_scan_req.pfUserScanResult) {
...@@ -2507,7 +2507,8 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv, ...@@ -2507,7 +2507,8 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv,
goto ERRORHANDLER; goto ERRORHANDLER;
} }
PRINT_D(HOSTINF_DBG, "Setting channel :%d\n", pstrHostIfRemainOnChan->u16Channel); PRINT_D(HOSTINF_DBG, "Setting channel :%d\n",
pstrHostIfRemainOnChan->ch);
u8remain_on_chan_flag = true; u8remain_on_chan_flag = true;
wid.id = (u16)WID_REMAIN_ON_CHAN; wid.id = (u16)WID_REMAIN_ON_CHAN;
...@@ -2520,7 +2521,7 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv, ...@@ -2520,7 +2521,7 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv,
} }
wid.val[0] = u8remain_on_chan_flag; wid.val[0] = u8remain_on_chan_flag;
wid.val[1] = (s8)pstrHostIfRemainOnChan->u16Channel; wid.val[1] = (s8)pstrHostIfRemainOnChan->ch;
result = send_config_pkt(SET_CFG, &wid, 1, result = send_config_pkt(SET_CFG, &wid, 1,
get_id_from_handler(hif_drv)); get_id_from_handler(hif_drv));
...@@ -4367,7 +4368,7 @@ s32 host_int_remain_on_channel(struct host_if_drv *hif_drv, u32 u32SessionID, ...@@ -4367,7 +4368,7 @@ s32 host_int_remain_on_channel(struct host_if_drv *hif_drv, u32 u32SessionID,
memset(&msg, 0, sizeof(struct host_if_msg)); memset(&msg, 0, sizeof(struct host_if_msg));
msg.id = HOST_IF_MSG_REMAIN_ON_CHAN; msg.id = HOST_IF_MSG_REMAIN_ON_CHAN;
msg.body.remain_on_ch.u16Channel = chan; msg.body.remain_on_ch.ch = chan;
msg.body.remain_on_ch.pRemainOnChanExpired = RemainOnChanExpired; msg.body.remain_on_ch.pRemainOnChanExpired = RemainOnChanExpired;
msg.body.remain_on_ch.pRemainOnChanReady = RemainOnChanReady; msg.body.remain_on_ch.pRemainOnChanReady = RemainOnChanReady;
msg.body.remain_on_ch.pVoid = pvUserArg; msg.body.remain_on_ch.pVoid = pvUserArg;
......
...@@ -236,7 +236,7 @@ struct ba_session_info { ...@@ -236,7 +236,7 @@ struct ba_session_info {
}; };
struct remain_ch { struct remain_ch {
u16 u16Channel; u16 ch;
u32 u32duration; u32 u32duration;
wilc_remain_on_chan_expired pRemainOnChanExpired; wilc_remain_on_chan_expired pRemainOnChanExpired;
wilc_remain_on_chan_ready pRemainOnChanReady; wilc_remain_on_chan_ready pRemainOnChanReady;
......
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