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

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

ath6kl: Cleanup parameters for wlan_refresh_inactive_nodes() 



And remove the reference to wmi in ath6kl_node_table.

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

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -88,7 +88,6 @@ enum crypto_type { 
 * is a second table for associated stations or neighbors.

 * is a second table for associated stations or neighbors.

 */

 */

struct ath6kl_node_table {

struct ath6kl_node_table {

	void *nt_wmi;		/* back reference */

	spinlock_t nt_nodelock;	/* on node table */

	spinlock_t nt_nodelock;	/* on node table */

	struct bss *nt_node_first;	/* information of all nodes */

	struct bss *nt_node_first;	/* information of all nodes */

	struct bss *nt_node_last;	/* information of all nodes */

	struct bss *nt_node_last;	/* information of all nodes */
@@ -159,7 +158,7 @@ void wlan_iterate_nodes(struct ath6kl_node_table *nt, 
void wlan_node_table_init(void *wmip, struct ath6kl_node_table *nt);

void wlan_node_table_init(void *wmip, struct ath6kl_node_table *nt);

void wlan_node_table_cleanup(struct ath6kl_node_table *nt);

void wlan_node_table_cleanup(struct ath6kl_node_table *nt);





void wlan_refresh_inactive_nodes(struct ath6kl_node_table *nt);

void wlan_refresh_inactive_nodes(struct ath6kl *ar);





struct bss *wlan_find_ssid_node(struct ath6kl_node_table *nt, u8 *ssid,

struct bss *wlan_find_ssid_node(struct ath6kl_node_table *nt, u8 *ssid,

				  u32 ssid_len, bool is_wpa2, bool match_ssid);

				  u32 ssid_len, bool is_wpa2, bool match_ssid);

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -169,17 +169,17 @@ void wlan_node_table_init(void *wmi, struct ath6kl_node_table *nt) 




	spin_lock_init(&nt->nt_nodelock);

	spin_lock_init(&nt->nt_nodelock);





	nt->nt_wmi = wmi;

	nt->nt_node_age = WLAN_NODE_INACT_TIMEOUT_MSEC;

	nt->nt_node_age = WLAN_NODE_INACT_TIMEOUT_MSEC;

}

}





void wlan_refresh_inactive_nodes(struct ath6kl_node_table *nt)

void wlan_refresh_inactive_nodes(struct ath6kl *ar)

{

{

	struct ath6kl_node_table *nt = &ar->scan_table;

	struct bss *bss;

	struct bss *bss;

	u8 my_bssid[ETH_ALEN];

	u8 my_bssid[ETH_ALEN];

	u32 now;

	u32 now;





	ath6kl_wmi_get_current_bssid(nt->nt_wmi, my_bssid);

	ath6kl_wmi_get_current_bssid(ar->wmi, my_bssid);





	now = jiffies_to_msecs(jiffies);

	now = jiffies_to_msecs(jiffies);

	bss = nt->nt_node_first;

	bss = nt->nt_node_first;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1009,7 +1009,7 @@ static int ath6kl_wmi_scan_complete_rx(struct wmi *wmi, u8 *datap, int len) 
	ev = (struct wmi_scan_complete_event *) datap;

	ev = (struct wmi_scan_complete_event *) datap;





	if (a_sle32_to_cpu(ev->status) == 0)

	if (a_sle32_to_cpu(ev->status) == 0)

		wlan_refresh_inactive_nodes(&wmi->parent_dev->scan_table);

		wlan_refresh_inactive_nodes(wmi->parent_dev);





	ath6kl_scan_complete_evt(wmi->parent_dev, a_sle32_to_cpu(ev->status));

	ath6kl_scan_complete_evt(wmi->parent_dev, a_sle32_to_cpu(ev->status));

	wmi->is_probe_ssid = false;

	wmi->is_probe_ssid = false;