---

yaml --- r: 265478 b: refs/heads/master c: e4c7ffc h: refs/heads/master v: v3
git-mirror · Aug 9, 2011 · e4d36a8 · e4d36a8
1 parent 21ee2a7
commit e4d36a8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c3075e9ea20a5feca48c8ff22dd23140e55ab1e
+refs/heads/master: e4c7ffcb9564dfed125e99daebc5fdce0b828626
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/common.h b/trunk/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/trunk/drivers/net/wireless/ath/ath6kl/node.c b/trunk/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/trunk/drivers/net/wireless/ath/ath6kl/wmi.c b/trunk/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;