rt2x00: Remove intf->bssid field.

The bssid field in struct rt2x00_intf is only written to once, and is
never read from.

Remove this field, as it appears to not be needed.

Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index af1d3efc2949481b8c05d32a66bf0d12eb80148a..5f7f52ff74d2e5b4b869701aab4fbfcbadb35921 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/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.
         */

diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index 4cac7ad60f476316522ec6c302fe0b8d410fefd3..23250a5d8331578665822c804da2c5ee907211da 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/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