Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a8bc5a4 authored by Vasanthakumar Thiagarajan's avatar Vasanthakumar Thiagarajan Committed by Kalle Valo
Browse files

ath6kl: Use ath6kl_cfg80211_scan_node() directly instead of function pointer 



Signed-off-by: default avatarVasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 77fccc78

drivers/net/wireless/ath/ath6kl/cfg80211.c

+2 −3
Original line number Diff line number Diff line
@@ -721,7 +721,7 @@ static inline bool is_ch_11a(u16 ch) 
}



/* struct ath6kl_node_table::nt_nodelock is locked when calling this */

static void ath6kl_cfg80211_scan_node(void *arg, struct bss *ni)

void ath6kl_cfg80211_scan_node(void *arg, struct bss *ni)

{

	struct wiphy *wiphy = (struct wiphy *)arg;

	u16 size;
@@ -833,8 +833,7 @@ void ath6kl_cfg80211_scan_complete_event(struct ath6kl *ar, int status) 
	}



	/* Translate data to cfg80211 mgmt format */

	wlan_iterate_nodes(&ar->scan_table, ath6kl_cfg80211_scan_node,

			   ar->wdev->wiphy);

	wlan_iterate_nodes(&ar->scan_table, ar->wdev->wiphy);



	cfg80211_scan_done(ar->scan_req, false);

drivers/net/wireless/ath/ath6kl/common.h

+2 −3
Original line number Diff line number Diff line
@@ -151,9 +151,7 @@ struct bss *wlan_find_node(struct ath6kl_node_table *nt, 
			   const u8 *mac_addr);

void wlan_node_reclaim(struct ath6kl_node_table *nt, struct bss *ni);

void wlan_free_allnodes(struct ath6kl_node_table *nt);

void wlan_iterate_nodes(struct ath6kl_node_table *nt,

			void (*f) (void *arg, struct bss *),

			void *arg);

void wlan_iterate_nodes(struct ath6kl_node_table *nt, void *arg);



void wlan_node_table_init(struct ath6kl_node_table *nt);

void wlan_node_table_cleanup(struct ath6kl_node_table *nt);
@@ -179,4 +177,5 @@ 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 */

drivers/net/wireless/ath/ath6kl/node.c

+2 −3
Original line number Diff line number Diff line
@@ -146,15 +146,14 @@ void wlan_free_allnodes(struct ath6kl_node_table *nt) 
		wlan_node_reclaim(nt, ni);

}



void wlan_iterate_nodes(struct ath6kl_node_table *nt,

			void (*f) (void *arg, struct bss *), void *arg)

void wlan_iterate_nodes(struct ath6kl_node_table *nt, void *arg)

{

	struct bss *ni;



	spin_lock_bh(&nt->nt_nodelock);

	for (ni = nt->nt_node_first; ni; ni = ni->ni_list_next) {

			ni->ni_refcnt++;

			(*f) (arg, ni);

			ath6kl_cfg80211_scan_node(arg, ni);

			wlan_node_dec_free(ni);

	}

	spin_unlock_bh(&nt->nt_nodelock);