From 91db35dae52d2cd0b5be90e01cff343dc65b981d Mon Sep 17 00:00:00 2001 From: Vasanthakumar Thiagarajan Date: Thu, 21 Jul 2011 18:12:15 +0530 Subject: [PATCH] ath6kl: Cleanup void * in ath6kl_cfg80211_scan_node() Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Kalle Valo --- drivers/net/wireless/ath/ath6kl/cfg80211.c | 3 +-- drivers/net/wireless/ath/ath6kl/common.h | 1 - drivers/net/wireless/ath/ath6kl/core.h | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c index d28e72a96e8..dc299a6b59c 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c @@ -721,9 +721,8 @@ static inline bool is_ch_11a(u16 ch) } /* struct ath6kl_node_table::nt_nodelock is locked when calling this */ -void ath6kl_cfg80211_scan_node(void *arg, struct bss *ni) +void ath6kl_cfg80211_scan_node(struct wiphy *wiphy, struct bss *ni) { - struct wiphy *wiphy = (struct wiphy *)arg; u16 size; unsigned char *ieeemgmtbuf = NULL; struct ieee80211_mgmt *mgmt; diff --git a/drivers/net/wireless/ath/ath6kl/common.h b/drivers/net/wireless/ath/ath6kl/common.h index ab03f445288..6b0d45642fe 100644 --- a/drivers/net/wireless/ath/ath6kl/common.h +++ b/drivers/net/wireless/ath/ath6kl/common.h @@ -177,5 +177,4 @@ 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/drivers/net/wireless/ath/ath6kl/core.h b/drivers/net/wireless/ath/ath6kl/core.h index f3f588a5a02..74170229523 100644 --- a/drivers/net/wireless/ath/ath6kl/core.h +++ b/drivers/net/wireless/ath/ath6kl/core.h @@ -540,4 +540,5 @@ void aggr_recv_addba_req_evt(struct ath6kl *ar, u8 tid, u16 seq_no, void ath6kl_wakeup_event(void *dev); void ath6kl_target_failure(struct ath6kl *ar); +void ath6kl_cfg80211_scan_node(struct wiphy *wiphy, struct bss *ni); #endif /* CORE_H */ -- 2.41.0