---

yaml --- r: 265480 b: refs/heads/master c: 46ff8d5 h: refs/heads/master v: v3
git-mirror · Aug 9, 2011 · 3c60bc0 · 3c60bc0
1 parent 0cb601d
commit 3c60bc0
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70df0516884834156f763f0e64a81712e26917c2
+refs/heads/master: 46ff8d5978b7796e3757b9ad908361beb8fb160b
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/node.c b/trunk/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/trunk/drivers/net/wireless/ath/ath6kl/wmi.c b/trunk/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/trunk/drivers/net/wireless/ath/ath6kl/wmi.h b/trunk/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);