diff options
| author | Ajay Singh | 2018-09-04 08:39:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-09-10 18:06:51 +0200 |
| commit | 804146b4bda386aefacdece4c5ab919940c02b12 (patch) | |
| tree | c31d917cbaeefe0e9a8e25e23e1cbabadfa0304c /drivers/staging/wilc1000/host_interface.c | |
| parent | staging: wilc1000: move 'chip_ps_state' static variable as part of 'wilc' struct (diff) | |
| download | kernel-qcow2-linux-804146b4bda386aefacdece4c5ab919940c02b12.tar.gz kernel-qcow2-linux-804146b4bda386aefacdece4c5ab919940c02b12.tar.xz kernel-qcow2-linux-804146b4bda386aefacdece4c5ab919940c02b12.zip | |
staging: wilc1000: move 'wilc_connecting' static variable to 'wilc_vif' struct
Move static variable 'wilc_connecting' as part of 'wilc_vif' private
struct. Remove "wilc_" prefix from name as its already part of wilc_vif
struct.
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000/host_interface.c')
| -rw-r--r-- | drivers/staging/wilc1000/host_interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 14dfa61ac6f2..7805ec1583b1 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -724,7 +724,7 @@ static void handle_scan(struct work_struct *work) goto error; } - if (vif->obtaining_ip || wilc_connecting) { + if (vif->obtaining_ip || vif->connecting) { netdev_err(vif->ndev, "Don't do obss scan\n"); result = -EBUSY; goto error; @@ -2330,7 +2330,7 @@ static int handle_remain_on_chan(struct wilc_vif *vif, goto error; } - if (vif->obtaining_ip || wilc_connecting) { + if (vif->obtaining_ip || vif->connecting) { result = -EBUSY; goto error; } |