From 18cc91a87457c4dcb633d68aa234754d86d6f5e3 Mon Sep 17 00:00:00 2001 From: Vasanthakumar Thiagarajan Date: Thu, 21 Jul 2011 14:32:43 +0530 Subject: [PATCH] --- yaml --- r: 265483 b: refs/heads/master c: 39dd3fcba2fe57866fe0913486472ae22e342c0e h: refs/heads/master i: 265481: 5e8dd237d29a4806f376ce19e810c00412be92c5 265479: 0cb601de511be346b453481b034c6e330fea3d94 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c | 2 +- trunk/drivers/net/wireless/ath/ath6kl/wmi.c | 4 ++-- trunk/drivers/net/wireless/ath/ath6kl/wmi.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 43545d7b04ab..0fe90b581091 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 852bd9d995352d593e9be0d668965aec39cf3f89 +refs/heads/master: 39dd3fcba2fe57866fe0913486472ae22e342c0e diff --git a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c index d1d479451409..9eaa1b1da3ef 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/trunk/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/trunk/drivers/net/wireless/ath/ath6kl/wmi.c b/trunk/drivers/net/wireless/ath/ath6kl/wmi.c index 742eaa123d89..6a6f79c8d78f 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/wmi.c +++ b/trunk/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/trunk/drivers/net/wireless/ath/ath6kl/wmi.h b/trunk/drivers/net/wireless/ath/ath6kl/wmi.h index 991d29fea19e..a9f8f9ee4805 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/wmi.h +++ b/trunk/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);