Commit 05d3bcb0 authored by Ajay Singh's avatar Ajay Singh Committed by Greg Kroah-Hartman

staging: wilc1000: handle remain on channel cfg ops from cfg80211 context

Refactor wilc_remain_on_channel() to handle remain_on_channel callback
from cfg80211 context.
Signed-off-by: default avatarAjay Singh <ajay.kathat@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 530975f3
......@@ -1592,14 +1592,6 @@ static void handle_scan_timer(struct work_struct *work)
kfree(msg);
}
static void handle_remain_on_chan_work(struct work_struct *work)
{
struct host_if_msg *msg = container_of(work, struct host_if_msg, work);
handle_remain_on_chan(msg->vif, &msg->body.remain_on_ch);
kfree(msg);
}
static void handle_scan_complete(struct work_struct *work)
{
struct host_if_msg *msg = container_of(work, struct host_if_msg, work);
......@@ -2527,25 +2519,19 @@ int wilc_remain_on_channel(struct wilc_vif *vif, u32 session_id,
wilc_remain_on_chan_ready ready,
void *user_arg)
{
struct remain_ch roc;
int result;
struct host_if_msg *msg;
msg = wilc_alloc_work(vif, handle_remain_on_chan_work, false);
if (IS_ERR(msg))
return PTR_ERR(msg);
msg->body.remain_on_ch.ch = chan;
msg->body.remain_on_ch.expired = expired;
msg->body.remain_on_ch.ready = ready;
msg->body.remain_on_ch.arg = user_arg;
msg->body.remain_on_ch.duration = duration;
msg->body.remain_on_ch.id = session_id;
result = wilc_enqueue_work(msg);
if (result) {
netdev_err(vif->ndev, "%s: enqueue work failed\n", __func__);
kfree(msg);
}
roc.ch = chan;
roc.expired = expired;
roc.ready = ready;
roc.arg = user_arg;
roc.duration = duration;
roc.id = session_id;
result = handle_remain_on_chan(vif, &roc);
if (result)
netdev_err(vif->ndev, "%s: failed to set remain on channel\n",
__func__);
return result;
}
......
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