diff options
| author | Ajay Singh | 2018-09-04 08:39:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-09-10 18:06:51 +0200 |
| commit | 28ab936ed10132f903b1b67ec6de1da9595d4b51 (patch) | |
| tree | 368be6ef8cd7bec36d3ea8b5331c9b265443422e | |
| parent | staging: wilc1000: move 'wilc_connecting' static variable to 'wilc_vif' struct (diff) | |
| download | kernel-qcow2-linux-28ab936ed10132f903b1b67ec6de1da9595d4b51.tar.gz kernel-qcow2-linux-28ab936ed10132f903b1b67ec6de1da9595d4b51.tar.xz kernel-qcow2-linux-28ab936ed10132f903b1b67ec6de1da9595d4b51.zip | |
staging: wilc1000: remove unnecessary static variable 'p2p_listen_state'
Remove the use of unnecessary static variable 'p2p_listen_state'.
Already 'p2p_listen_state' is present in 'wilc_priv' struct. So making
use of that variable as its getting set in channel ready and
remain on channel expired callback.
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/wilc1000/host_interface.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 7805ec1583b1..9d90994c65a6 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -187,7 +187,6 @@ struct join_bss_param { }; static struct host_if_drv *terminated_handle; -static u8 p2p_listen_state; static struct completion hif_driver_comp; static struct mutex hif_deinit_lock; @@ -2355,7 +2354,6 @@ static int handle_remain_on_chan(struct wilc_vif *vif, netdev_err(vif->ndev, "Failed to set remain on channel\n"); error: - p2p_listen_state = 1; hif_drv->remain_on_ch_timer_vif = vif; mod_timer(&hif_drv->remain_on_ch_timer, jiffies + msecs_to_jiffies(hif_remain_ch->duration)); @@ -2411,8 +2409,9 @@ static void handle_listen_state_expired(struct work_struct *work) struct wid wid; int result; struct host_if_drv *hif_drv = vif->hif_drv; + struct wilc_priv *priv = wdev_priv(vif->ndev->ieee80211_ptr); - if (p2p_listen_state) { + if (priv->p2p_listen_state) { remain_on_chan_flag = false; wid.id = WID_REMAIN_ON_CHAN; wid.type = WID_STR; @@ -2437,7 +2436,6 @@ static void handle_listen_state_expired(struct work_struct *work) hif_drv->remain_on_ch.expired(hif_drv->remain_on_ch.arg, hif_remain_ch->id); } - p2p_listen_state = 0; } else { netdev_dbg(vif->ndev, "Not in listen state\n"); } |