diff options
| -rw-r--r-- | drivers/net/wireless/ath/ath6kl/node.c | 5 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath6kl/wmi.c | 6 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath6kl/wmi.h | 1 |
3 files changed, 1 insertions, 11 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/node.c b/drivers/net/wireless/ath/ath6kl/node.c index 533588cb5a1c..961154193ef5 100644 --- a/drivers/net/wireless/ath/ath6kl/node.c +++ b/drivers/net/wireless/ath/ath6kl/node.c @@ -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); diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c index ff71b7f3f7f4..50cee9bf0e2b 100644 --- a/drivers/net/wireless/ath/ath6kl/wmi.c +++ b/drivers/net/wireless/ath/ath6kl/wmi.c @@ -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; diff --git a/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h index 1646a9279efb..991d29fea19e 100644 --- a/drivers/net/wireless/ath/ath6kl/wmi.h +++ b/drivers/net/wireless/ath/ath6kl/wmi.h @@ -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); |
