From 3c76c3fe5c4633bffff6ec9bd7d344cbe42ada09 Mon Sep 17 00:00:00 2001
From: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Date: Thu, 21 Jul 2011 14:42:52 +0530
Subject: [PATCH] --- yaml --- r: 265485 b: refs/heads/master c:
 8a8bc5a440a0b42cc8fc0d5a60c041e7ab5d76d1 h: refs/heads/master i:   265483:
 18cc91a87457c4dcb633d68aa234754d86d6f5e3 v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c | 5 ++---
 trunk/drivers/net/wireless/ath/ath6kl/common.h   | 5 ++---
 trunk/drivers/net/wireless/ath/ath6kl/node.c     | 5 ++---
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 5628e0a25472..3745e66d82b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77fccc78a0fac77ac71fe341243970cfcd9a8ad3
+refs/heads/master: 8a8bc5a440a0b42cc8fc0d5a60c041e7ab5d76d1
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c
index cf5ab55cc0df..d28e72a96e84 100644
--- a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -721,7 +721,7 @@ static inline bool is_ch_11a(u16 ch)
 }
 
 /* struct ath6kl_node_table::nt_nodelock is locked when calling this */
-static void ath6kl_cfg80211_scan_node(void *arg, struct bss *ni)
+void ath6kl_cfg80211_scan_node(void *arg, struct bss *ni)
 {
 	struct wiphy *wiphy = (struct wiphy *)arg;
 	u16 size;
@@ -833,8 +833,7 @@ void ath6kl_cfg80211_scan_complete_event(struct ath6kl *ar, int status)
 	}
 
 	/* Translate data to cfg80211 mgmt format */
-	wlan_iterate_nodes(&ar->scan_table, ath6kl_cfg80211_scan_node,
-			   ar->wdev->wiphy);
+	wlan_iterate_nodes(&ar->scan_table, ar->wdev->wiphy);
 
 	cfg80211_scan_done(ar->scan_req, false);
 
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/common.h b/trunk/drivers/net/wireless/ath/ath6kl/common.h
index e37ae9bafc0d..ab03f4452888 100644
--- a/trunk/drivers/net/wireless/ath/ath6kl/common.h
+++ b/trunk/drivers/net/wireless/ath/ath6kl/common.h
@@ -151,9 +151,7 @@ struct bss *wlan_find_node(struct ath6kl_node_table *nt,
 			   const u8 *mac_addr);
 void wlan_node_reclaim(struct ath6kl_node_table *nt, struct bss *ni);
 void wlan_free_allnodes(struct ath6kl_node_table *nt);
-void wlan_iterate_nodes(struct ath6kl_node_table *nt,
-			void (*f) (void *arg, struct bss *),
-			void *arg);
+void wlan_iterate_nodes(struct ath6kl_node_table *nt, void *arg);
 
 void wlan_node_table_init(struct ath6kl_node_table *nt);
 void wlan_node_table_cleanup(struct ath6kl_node_table *nt);
@@ -179,4 +177,5 @@ struct ath6kl *ath6kl_core_alloc(struct device *sdev);
 int ath6kl_core_init(struct ath6kl *ar);
 int ath6kl_unavail_ev(struct ath6kl *ar);
 struct sk_buff *ath6kl_buf_alloc(int size);
+void ath6kl_cfg80211_scan_node(void *arg, struct bss *ni);
 #endif /* COMMON_H */
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/node.c b/trunk/drivers/net/wireless/ath/ath6kl/node.c
index 7c9fbde9dedd..131205c610b9 100644
--- a/trunk/drivers/net/wireless/ath/ath6kl/node.c
+++ b/trunk/drivers/net/wireless/ath/ath6kl/node.c
@@ -146,15 +146,14 @@ void wlan_free_allnodes(struct ath6kl_node_table *nt)
 		wlan_node_reclaim(nt, ni);
 }
 
-void wlan_iterate_nodes(struct ath6kl_node_table *nt,
-			void (*f) (void *arg, struct bss *), void *arg)
+void wlan_iterate_nodes(struct ath6kl_node_table *nt, void *arg)
 {
 	struct bss *ni;
 
 	spin_lock_bh(&nt->nt_nodelock);
 	for (ni = nt->nt_node_first; ni; ni = ni->ni_list_next) {
 			ni->ni_refcnt++;
-			(*f) (arg, ni);
+			ath6kl_cfg80211_scan_node(arg, ni);
 			wlan_node_dec_free(ni);
 	}
 	spin_unlock_bh(&nt->nt_nodelock);