p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

staging: wilc1000: move static variable clients_count to 'wilc' structure 

Avoid use of static variable 'clients_count' and move it part of 'wilc'
structure.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ajay Singh 2018-09-04 12:09:25 +05:30 committed by Greg Kroah-Hartman
parent 6bccf8fc6c
commit 0b68334d48
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/wilc1000/host_interface.c
View File

@ -199,7 +199,6 @@ static u8 rcv_assoc_resp[MAX_ASSOC_RESP_FRAME_SIZE];
static u8 set_ip[2][4];
static u8 get_ip[2][4];
static u32 clients_count;
static int host_int_get_ipaddress(struct wilc_vif *vif, u8 *ip_addr, u8 idx);
@ -3456,7 +3455,7 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler)
vif->obtaining_ip = false;
if (clients_count == 0) {
if (wilc->clients_count == 0) {
init_completion(&hif_driver_comp);
mutex_init(&hif_deinit_lock);
@ -3490,7 +3489,7 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler)
mutex_unlock(&hif_drv->cfg_values_lock);
clients_count++;
wilc->clients_count++;
return 0;
}
@ -3526,7 +3525,7 @@ int wilc_deinit(struct wilc_vif *vif)
hif_drv->hif_state = HOST_IF_IDLE;
if (clients_count == 1) {
if (vif->wilc->clients_count == 1) {
struct host_if_msg *msg;
msg = wilc_alloc_work(vif, handle_hif_exit_work, true);
@ -3544,7 +3543,7 @@ int wilc_deinit(struct wilc_vif *vif)
kfree(hif_drv);
clients_count--;
vif->wilc->clients_count--;
terminated_handle = NULL;
mutex_unlock(&hif_deinit_lock);
return result;

1
drivers/staging/wilc1000/wilc_wfi_netdevice.h
View File

@ -171,6 +171,7 @@ struct wilc {
struct rf_info dummy_statistics;
bool enable_ps;
int clients_count;
};
struct wilc_wfi_mon_priv {