---

yaml
---
r: 265479
b: refs/heads/master
c: 70df051
h: refs/heads/master
i:
  265477: 21ee2a7
  265475: 84b357f
  265471: 771a277
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4c7ffcb9564dfed125e99daebc5fdce0b828626
+refs/heads/master: 70df0516884834156f763f0e64a81712e26917c2

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

@@ -498,8 +498,6 @@ static int ath6kl_wmi_connect_event_rx(struct wmi *wmi, u8 *datap, int len)
 	ath6kl_dbg(ATH6KL_DBG_WMI, "%s: freq %d bssid %pM\n",
 		   __func__, ev->ch, ev->bssid);
 
-	memcpy(wmi->bssid, ev->bssid, ETH_ALEN);
-
 	/* Start of assoc rsp IEs */
 	pie = ev->assoc_info + ev->beacon_ie_len +
 	      ev->assoc_req_len + (sizeof(u16) * 3); /* capinfo, status, aid */
@@ -546,7 +544,6 @@ static int ath6kl_wmi_disconnect_event_rx(struct wmi *wmi, u8 *datap, int len)
 		return -EINVAL;
 
 	ev = (struct wmi_disconnect_event *) datap;
-	memset(wmi->bssid, 0, sizeof(wmi->bssid));
 
 	wmi->is_wmm_enabled = false;
 	wmi->pair_crypto_type = NONE_CRYPT;
@@ -772,7 +769,7 @@ static int ath6kl_wmi_bssinfo_event_rx(struct wmi *wmi, u8 *datap, int len)
 		 * instance value of scan result. It also sync up RSSI info
 		 * in GUI between scan result and RSSI signal icon.
 		 */
-		if (memcmp(wmi->bssid, bih->bssid, ETH_ALEN) == 0) {
+		if (memcmp(wmi->parent_dev->bssid, bih->bssid, ETH_ALEN) == 0) {
 			bih->rssi = a_cpu_to_sle16(bss->ni_rssi);
 			bih->snr = bss->ni_snr;
 		}
@@ -2253,7 +2250,7 @@ int ath6kl_wmi_get_tx_pwr_cmd(struct wmi *wmi)
 void ath6kl_wmi_get_current_bssid(struct wmi *wmi, u8 *bssid)
 {
 	if (bssid)
-		memcpy(bssid, wmi->bssid, ETH_ALEN);
+		memcpy(bssid, wmi->parent_dev->bssid, ETH_ALEN);
 }
 
 int ath6kl_wmi_set_lpreamble_cmd(struct wmi *wmi, u8 status, u8 preamble_policy)

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

@@ -116,7 +116,6 @@ struct wmi {
 	u8 fat_pipe_exist;
 	struct ath6kl *parent_dev;
 	struct wmi_stats stat;
-	u8 bssid[ETH_ALEN];
 	u8 pwr_mode;
 	u8 phy_mode;
 	u8 keep_alive_intvl;