Skip to content

Commit

Permalink
ath6kl: Cleanup parameters for wlan_refresh_inactive_nodes()
Browse files Browse the repository at this point in the history
And remove the reference to wmi in ath6kl_node_table.

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
  • Loading branch information
Vasanthakumar Thiagarajan authored and Kalle Valo committed Aug 9, 2011
1 parent 7c3075e commit e4c7ffc
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
3 changes: 1 addition & 2 deletions drivers/net/wireless/ath/ath6kl/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ enum crypto_type {
* is a second table for associated stations or neighbors.
*/
struct ath6kl_node_table {
void *nt_wmi; /* back reference */
spinlock_t nt_nodelock; /* on node table */
struct bss *nt_node_first; /* information of all nodes */
struct bss *nt_node_last; /* information of all nodes */
Expand Down Expand Up @@ -159,7 +158,7 @@ void wlan_iterate_nodes(struct ath6kl_node_table *nt,
void wlan_node_table_init(void *wmip, struct ath6kl_node_table *nt);
void wlan_node_table_cleanup(struct ath6kl_node_table *nt);

void wlan_refresh_inactive_nodes(struct ath6kl_node_table *nt);
void wlan_refresh_inactive_nodes(struct ath6kl *ar);

struct bss *wlan_find_ssid_node(struct ath6kl_node_table *nt, u8 *ssid,
u32 ssid_len, bool is_wpa2, bool match_ssid);
Expand Down
6 changes: 3 additions & 3 deletions drivers/net/wireless/ath/ath6kl/node.c
Original file line number Diff line number Diff line change
Expand Up @@ -169,17 +169,17 @@ void wlan_node_table_init(void *wmi, struct ath6kl_node_table *nt)

spin_lock_init(&nt->nt_nodelock);

nt->nt_wmi = wmi;
nt->nt_node_age = WLAN_NODE_INACT_TIMEOUT_MSEC;
}

void wlan_refresh_inactive_nodes(struct ath6kl_node_table *nt)
void wlan_refresh_inactive_nodes(struct ath6kl *ar)
{
struct ath6kl_node_table *nt = &ar->scan_table;
struct bss *bss;
u8 my_bssid[ETH_ALEN];
u32 now;

ath6kl_wmi_get_current_bssid(nt->nt_wmi, my_bssid);
ath6kl_wmi_get_current_bssid(ar->wmi, my_bssid);

now = jiffies_to_msecs(jiffies);
bss = nt->nt_node_first;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/ath/ath6kl/wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1009,7 +1009,7 @@ static int ath6kl_wmi_scan_complete_rx(struct wmi *wmi, u8 *datap, int len)
ev = (struct wmi_scan_complete_event *) datap;

if (a_sle32_to_cpu(ev->status) == 0)
wlan_refresh_inactive_nodes(&wmi->parent_dev->scan_table);
wlan_refresh_inactive_nodes(wmi->parent_dev);

ath6kl_scan_complete_evt(wmi->parent_dev, a_sle32_to_cpu(ev->status));
wmi->is_probe_ssid = false;
Expand Down

0 comments on commit e4c7ffc

Please sign in to comment.