Commit 9d764e38 authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman

staging: wilc1000: rename u32ListenSessionID of struct remain_ch

This patch renames u32ListenSessionID of struct remain_ch to id
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 7d069728
...@@ -2489,7 +2489,7 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv, ...@@ -2489,7 +2489,7 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv,
hif_drv->remain_on_ch.expired = pstrHostIfRemainOnChan->expired; hif_drv->remain_on_ch.expired = pstrHostIfRemainOnChan->expired;
hif_drv->remain_on_ch.ready = pstrHostIfRemainOnChan->ready; hif_drv->remain_on_ch.ready = pstrHostIfRemainOnChan->ready;
hif_drv->remain_on_ch.ch = pstrHostIfRemainOnChan->ch; hif_drv->remain_on_ch.ch = pstrHostIfRemainOnChan->ch;
hif_drv->remain_on_ch.u32ListenSessionID = pstrHostIfRemainOnChan->u32ListenSessionID; hif_drv->remain_on_ch.id = pstrHostIfRemainOnChan->id;
} else { } else {
pstrHostIfRemainOnChan->ch = hif_drv->remain_on_ch.ch; pstrHostIfRemainOnChan->ch = hif_drv->remain_on_ch.ch;
} }
...@@ -2617,7 +2617,7 @@ static u32 Handle_ListenStateExpired(struct host_if_drv *hif_drv, ...@@ -2617,7 +2617,7 @@ static u32 Handle_ListenStateExpired(struct host_if_drv *hif_drv,
if (hif_drv->remain_on_ch.expired) { if (hif_drv->remain_on_ch.expired) {
hif_drv->remain_on_ch.expired(hif_drv->remain_on_ch.arg, hif_drv->remain_on_ch.expired(hif_drv->remain_on_ch.arg,
pstrHostIfRemainOnChan->u32ListenSessionID); pstrHostIfRemainOnChan->id);
} }
P2P_LISTEN_STATE = 0; P2P_LISTEN_STATE = 0;
} else { } else {
...@@ -2640,7 +2640,7 @@ static void ListenTimerCB(unsigned long arg) ...@@ -2640,7 +2640,7 @@ static void ListenTimerCB(unsigned long arg)
memset(&msg, 0, sizeof(struct host_if_msg)); memset(&msg, 0, sizeof(struct host_if_msg));
msg.id = HOST_IF_MSG_LISTEN_TIMER_FIRED; msg.id = HOST_IF_MSG_LISTEN_TIMER_FIRED;
msg.drv = hif_drv; msg.drv = hif_drv;
msg.body.remain_on_ch.u32ListenSessionID = hif_drv->remain_on_ch.u32ListenSessionID; msg.body.remain_on_ch.id = hif_drv->remain_on_ch.id;
result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg)); result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
if (result) if (result)
...@@ -4377,7 +4377,7 @@ s32 host_int_remain_on_channel(struct host_if_drv *hif_drv, u32 u32SessionID, ...@@ -4377,7 +4377,7 @@ s32 host_int_remain_on_channel(struct host_if_drv *hif_drv, u32 u32SessionID,
msg.body.remain_on_ch.ready = RemainOnChanReady; msg.body.remain_on_ch.ready = RemainOnChanReady;
msg.body.remain_on_ch.arg = pvUserArg; msg.body.remain_on_ch.arg = pvUserArg;
msg.body.remain_on_ch.u32duration = u32duration; msg.body.remain_on_ch.u32duration = u32duration;
msg.body.remain_on_ch.u32ListenSessionID = u32SessionID; msg.body.remain_on_ch.id = u32SessionID;
msg.drv = hif_drv; msg.drv = hif_drv;
result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg)); result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
...@@ -4402,7 +4402,7 @@ s32 host_int_ListenStateExpired(struct host_if_drv *hif_drv, u32 u32SessionID) ...@@ -4402,7 +4402,7 @@ s32 host_int_ListenStateExpired(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_LISTEN_TIMER_FIRED; msg.id = HOST_IF_MSG_LISTEN_TIMER_FIRED;
msg.drv = hif_drv; msg.drv = hif_drv;
msg.body.remain_on_ch.u32ListenSessionID = u32SessionID; msg.body.remain_on_ch.id = u32SessionID;
result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg)); result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
if (result) if (result)
......
...@@ -244,7 +244,7 @@ struct remain_ch { ...@@ -244,7 +244,7 @@ struct remain_ch {
wilc_remain_on_chan_expired expired; wilc_remain_on_chan_expired expired;
wilc_remain_on_chan_ready ready; wilc_remain_on_chan_ready ready;
void *arg; void *arg;
u32 u32ListenSessionID; u32 id;
}; };
struct reg_frame { struct reg_frame {
......
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