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

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

ath6kl: Remove ath6kl_wmi_get_current_bssid() 



Use the bssid from ath6kl directly.

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

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

+1 −4
Original line number Diff line number Diff line
@@ -176,16 +176,13 @@ void wlan_refresh_inactive_nodes(struct ath6kl *ar) 
{

	struct ath6kl_node_table *nt = &ar->scan_table;

	struct bss *bss;

	u8 my_bssid[ETH_ALEN];

	u32 now;



	ath6kl_wmi_get_current_bssid(ar->wmi, my_bssid);



	now = jiffies_to_msecs(jiffies);

	bss = nt->nt_node_first;

	while (bss != NULL) {

		/* refresh all nodes except the current bss */

		if (memcmp(my_bssid, bss->ni_macaddr, sizeof(my_bssid)) != 0) {

		if (memcmp(ar->bssid, bss->ni_macaddr, ETH_ALEN) != 0) {

			if (((now - bss->ni_tstamp) > nt->nt_node_age)

			    || --bss->ni_actcnt == 0) {

				wlan_node_reclaim(nt, bss);

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

+0 −6
Original line number Diff line number Diff line
@@ -2247,12 +2247,6 @@ int ath6kl_wmi_get_tx_pwr_cmd(struct wmi *wmi) 
	return ath6kl_wmi_simple_cmd(wmi, WMI_GET_TX_PWR_CMDID);

}



void ath6kl_wmi_get_current_bssid(struct wmi *wmi, u8 *bssid)

{

	if (bssid)

		memcpy(bssid, wmi->parent_dev->bssid, ETH_ALEN);

}



int ath6kl_wmi_set_lpreamble_cmd(struct wmi *wmi, u8 status, u8 preamble_policy)

{

	struct sk_buff *skb;

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

+0 −1
Original line number Diff line number Diff line
@@ -1995,7 +1995,6 @@ int ath6kl_wmi_setpmkid_cmd(struct wmi *wmi, const u8 *bssid, 
			    const u8 *pmkid, bool set);

int ath6kl_wmi_set_tx_pwr_cmd(struct wmi *wmi, u8 dbM);

int ath6kl_wmi_get_tx_pwr_cmd(struct wmi *wmi);

void ath6kl_wmi_get_current_bssid(struct wmi *wmi, u8 *bssid);



int ath6kl_wmi_set_wmm_txop(struct wmi *wmi, enum wmi_txop_cfg cfg);

int ath6kl_wmi_set_keepalive_cmd(struct wmi *wmi, u8 keep_alive_intvl);