From: Vasanthakumar Thiagarajan Date: Thu, 21 Jul 2011 09:06:55 +0000 (+0530) Subject: ath6kl: Remove ath6kl_wmi_iterate_nodes() X-Git-Tag: v3.2-rc1~129^2~422^2^2~19^2~4 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=77fccc78a0fac77ac71fe341243970cfcd9a8ad3;p=~emulex%2Finfiniband.git ath6kl: Remove ath6kl_wmi_iterate_nodes() Use wlan_iterate_nodes() directly. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Kalle Valo --- diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c index 9eaa1b1da3e..cf5ab55cc0d 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) } /* Translate data to cfg80211 mgmt format */ - ath6kl_wmi_iterate_nodes(&ar->scan_table, ath6kl_cfg80211_scan_node, - ar->wdev->wiphy); + wlan_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 6a6f79c8d78..f5aa33dd4c4 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) return 0; } -void ath6kl_wmi_iterate_nodes(struct ath6kl_node_table *scan_tbl, - void (*f) (void *arg, struct bss *), - void *arg) -{ - wlan_iterate_nodes(scan_tbl, f, arg); -} - static void ath6kl_wmi_convert_bssinfo_hdr2_to_hdr(struct sk_buff *skb, u8 *datap) { diff --git a/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h index a9f8f9ee480..fe3ddce6408 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, u8 *ac); int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb); -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); void ath6kl_wmi_node_free(struct wmi *wmi, const u8 *mac_addr);