---

yaml
---
r: 225535
b: refs/heads/master
c: 773d1b9
h: refs/heads/master
i:
  225533: a433dc8
  225531: 36bebdd
  225527: 9f65d88
  225519: e92c907
  225503: 3b70a2b
  225471: 182e9b2
  225407: ffcc077
  225279: 0c33c89
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5235189c8edddf2eb32982f814bc858b55e6350a
+refs/heads/master: 773d1b98268a9effac047fd2ab1c47bf9f7a9e5f

trunk/drivers/net/wireless/rt2x00/rt2x00.h

@@ -364,11 +364,6 @@ struct rt2x00_intf {
 	 */
 	u8 mac[ETH_ALEN];
 
-	/*
-	 * BBSID of the AP to associate with.
-	 */
-	u8 bssid[ETH_ALEN];
-
 	/*
 	 * beacon->skb must be protected with the mutex.
 	 */

trunk/drivers/net/wireless/rt2x00/rt2x00mac.c

@@ -614,17 +614,6 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
 	if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags))
 		return;
 
-	spin_lock(&intf->lock);
-
-	/*
-	 * conf->bssid can be NULL if coming from the internal
-	 * beacon update routine.
-	 */
-	if (changes & BSS_CHANGED_BSSID)
-		memcpy(&intf->bssid, bss_conf->bssid, ETH_ALEN);
-
-	spin_unlock(&intf->lock);
-
 	/*
 	 * Call rt2x00_config_intf() outside of the spinlock context since
 	 * the call will sleep for USB drivers. By using the ieee80211_if_conf