diff options
author | Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com> | 2011-07-21 05:06:55 -0400 |
---|---|---|
committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2011-08-09 12:45:23 -0400 |
commit | 77fccc78a0fac77ac71fe341243970cfcd9a8ad3 (patch) | |
tree | b07e1beddbe2030747b9650636b26153a00959f1 | |
parent | 39dd3fcba2fe57866fe0913486472ae22e342c0e (diff) |
ath6kl: Remove ath6kl_wmi_iterate_nodes()
Use wlan_iterate_nodes() directly.
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.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/wmi.c | 7 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/wmi.h | 3 |
3 files changed, 2 insertions, 12 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c index 9eaa1b1da3ef..cf5ab55cc0df 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c | |||
@@ -833,8 +833,8 @@ void ath6kl_cfg80211_scan_complete_event(struct ath6kl *ar, int status) | |||
833 | } | 833 | } |
834 | 834 | ||
835 | /* Translate data to cfg80211 mgmt format */ | 835 | /* Translate data to cfg80211 mgmt format */ |
836 | ath6kl_wmi_iterate_nodes(&ar->scan_table, ath6kl_cfg80211_scan_node, | 836 | wlan_iterate_nodes(&ar->scan_table, ath6kl_cfg80211_scan_node, |
837 | ar->wdev->wiphy); | 837 | ar->wdev->wiphy); |
838 | 838 | ||
839 | cfg80211_scan_done(ar->scan_req, false); | 839 | cfg80211_scan_done(ar->scan_req, false); |
840 | 840 | ||
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c index 6a6f79c8d78f..f5aa33dd4c42 100644 --- a/drivers/net/wireless/ath/ath6kl/wmi.c +++ b/drivers/net/wireless/ath/ath6kl/wmi.c | |||
@@ -386,13 +386,6 @@ int ath6kl_wmi_data_hdr_remove(struct wmi *wmi, struct sk_buff *skb) | |||
386 | return 0; | 386 | return 0; |
387 | } | 387 | } |
388 | 388 | ||
389 | void ath6kl_wmi_iterate_nodes(struct ath6kl_node_table *scan_tbl, | ||
390 | void (*f) (void *arg, struct bss *), | ||
391 | void *arg) | ||
392 | { | ||
393 | wlan_iterate_nodes(scan_tbl, f, arg); | ||
394 | } | ||
395 | |||
396 | static void ath6kl_wmi_convert_bssinfo_hdr2_to_hdr(struct sk_buff *skb, | 389 | static void ath6kl_wmi_convert_bssinfo_hdr2_to_hdr(struct sk_buff *skb, |
397 | u8 *datap) | 390 | u8 *datap) |
398 | { | 391 | { |
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h index a9f8f9ee4805..fe3ddce64087 100644 --- a/drivers/net/wireless/ath/ath6kl/wmi.h +++ b/drivers/net/wireless/ath/ath6kl/wmi.h | |||
@@ -1931,9 +1931,6 @@ int ath6kl_wmi_implicit_create_pstream(struct wmi *wmi, struct sk_buff *skb, | |||
1931 | u8 *ac); | 1931 | u8 *ac); |
1932 | 1932 | ||
1933 | int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb); | 1933 | int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb); |
1934 | void ath6kl_wmi_iterate_nodes(struct ath6kl_node_table *scan_tbl, | ||
1935 | void (*f) (void *arg, struct bss *), | ||
1936 | void *arg); | ||
1937 | struct bss *ath6kl_wmi_find_node(struct wmi *wmi, const u8 *mac_addr); | 1934 | struct bss *ath6kl_wmi_find_node(struct wmi *wmi, const u8 *mac_addr); |
1938 | void ath6kl_wmi_node_free(struct wmi *wmi, const u8 *mac_addr); | 1935 | void ath6kl_wmi_node_free(struct wmi *wmi, const u8 *mac_addr); |
1939 | 1936 | ||