ath6kl: Cleanup parameters for wlan_refresh_inactive_nodes()

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>

diff --git a/drivers/net/wireless/ath/ath6kl/common.h b/drivers/net/wireless/ath/ath6kl/common.h
index 0a3a1d80d0a49c3b2ff72f76cd18cdec3aa6b6a5..cc8b04097739476f28114ac3ad9328d306bd6a1c 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/common.h
+++ b/drivers/net/wireless/ath/ath6kl/common.h
@@ -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 */
@@ -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);

diff --git a/drivers/net/wireless/ath/ath6kl/node.c b/drivers/net/wireless/ath/ath6kl/node.c
index b0f9ba2e463c4c153be8bcd63e8c24eb4f638c42..533588cb5a1c901a6ff0aae9cfa6e4be7a4d1aa8 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/node.c
+++ b/drivers/net/wireless/ath/ath6kl/node.c
@@ -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;

diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c
index 2e1b4111e6b2b7ac301b17d3920c3a95d244525c..ea123c9d30c3a8b446f19d380c6ccaf9522d86d9 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -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;