summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>2011-07-21 11:02:43 +0200
committerKalle Valo <kvalo@qca.qualcomm.com>2011-08-09 18:45:23 +0200
commit39dd3fcba2fe57866fe0913486472ae22e342c0e (patch)
tree3133fba0768d69d9dd0dc4f4718a2e37de03165e
parentath6kl: Move initialization/deinitialization of scan_table to appropriate fun... (diff)
downloadlinux-39dd3fcba2fe57866fe0913486472ae22e342c0e.tar.xz
linux-39dd3fcba2fe57866fe0913486472ae22e342c0e.zip
ath6kl: Pass only the needed scan_table to ath6kl_wmi_iterate_nodes()
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
-rw-r--r--drivers/net/wireless/ath/ath6kl/cfg80211.c2
-rw-r--r--drivers/net/wireless/ath/ath6kl/wmi.c4
-rw-r--r--drivers/net/wireless/ath/ath6kl/wmi.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index d1d479451409..9eaa1b1da3ef 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -833,7 +833,7 @@ void ath6kl_cfg80211_scan_complete_event(struct ath6kl *ar, int status)
}
/* Translate data to cfg80211 mgmt format */
- ath6kl_wmi_iterate_nodes(ar->wmi, ath6kl_cfg80211_scan_node,
+ ath6kl_wmi_iterate_nodes(&ar->scan_table, ath6kl_cfg80211_scan_node,
ar->wdev->wiphy);
cfg80211_scan_done(ar->scan_req, false);
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c
index 742eaa123d89..6a6f79c8d78f 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -386,11 +386,11 @@ int ath6kl_wmi_data_hdr_remove(struct wmi *wmi, struct sk_buff *skb)
return 0;
}
-void ath6kl_wmi_iterate_nodes(struct wmi *wmi,
+void ath6kl_wmi_iterate_nodes(struct ath6kl_node_table *scan_tbl,
void (*f) (void *arg, struct bss *),
void *arg)
{
- wlan_iterate_nodes(&wmi->parent_dev->scan_table, f, arg);
+ wlan_iterate_nodes(scan_tbl, f, arg);
}
static void ath6kl_wmi_convert_bssinfo_hdr2_to_hdr(struct sk_buff *skb,
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h
index 991d29fea19e..a9f8f9ee4805 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.h
+++ b/drivers/net/wireless/ath/ath6kl/wmi.h
@@ -1931,7 +1931,7 @@ int ath6kl_wmi_implicit_create_pstream(struct wmi *wmi, struct sk_buff *skb,
u8 *ac);
int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb);
-void ath6kl_wmi_iterate_nodes(struct wmi *wmi,
+void ath6kl_wmi_iterate_nodes(struct ath6kl_node_table *scan_tbl,
void (*f) (void *arg, struct bss *),
void *arg);
struct bss *ath6kl_wmi_find_node(struct wmi *wmi, const u8 *mac_addr);