Commit 6566dc04 authored by Ajay Singh's avatar Ajay Singh Committed by Greg Kroah-Hartman

staging: wilc1000: avoid use of static variable 'inactive_time'

Avoided the use of static variable 'inactive_time' and move it as part of
'sta_inactive_t' structure.
Signed-off-by: default avatarAjay Singh <ajay.kathat@microchip.com>
Reviewed-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 56b408e5
...@@ -110,6 +110,7 @@ struct set_ip_addr { ...@@ -110,6 +110,7 @@ struct set_ip_addr {
}; };
struct sta_inactive_t { struct sta_inactive_t {
u32 inactive_time;
u8 mac[6]; u8 mac[6];
}; };
...@@ -198,7 +199,6 @@ static u8 rcv_assoc_resp[MAX_ASSOC_RESP_FRAME_SIZE]; ...@@ -198,7 +199,6 @@ static u8 rcv_assoc_resp[MAX_ASSOC_RESP_FRAME_SIZE];
static s8 rssi; static s8 rssi;
static u8 set_ip[2][4]; static u8 set_ip[2][4];
static u8 get_ip[2][4]; static u8 get_ip[2][4];
static u32 inactive_time;
static u32 clients_count; static u32 clients_count;
static void *host_int_parse_join_bss_param(struct network_info *info); static void *host_int_parse_join_bss_param(struct network_info *info);
...@@ -1927,7 +1927,7 @@ static void handle_get_inactive_time(struct work_struct *work) ...@@ -1927,7 +1927,7 @@ static void handle_get_inactive_time(struct work_struct *work)
wid.id = (u16)WID_GET_INACTIVE_TIME; wid.id = (u16)WID_GET_INACTIVE_TIME;
wid.type = WID_INT; wid.type = WID_INT;
wid.val = (s8 *)&inactive_time; wid.val = (s8 *)&hif_sta_inactive->inactive_time;
wid.size = sizeof(u32); wid.size = sizeof(u32);
result = wilc_send_config_pkt(vif, GET_CFG, &wid, 1, result = wilc_send_config_pkt(vif, GET_CFG, &wid, 1,
...@@ -3095,7 +3095,7 @@ s32 wilc_get_inactive_time(struct wilc_vif *vif, const u8 *mac, ...@@ -3095,7 +3095,7 @@ s32 wilc_get_inactive_time(struct wilc_vif *vif, const u8 *mac,
else else
wait_for_completion(&msg->work_comp); wait_for_completion(&msg->work_comp);
*out_val = inactive_time; *out_val = msg->body.mac_info.inactive_time;
kfree(msg); kfree(msg);
return result; 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