From 29d568c7bec845ee07e7cc26ae378ab2228a393e Mon Sep 17 00:00:00 2001 From: Gertjan van Wingerde Date: Mon, 27 Dec 2010 15:05:14 +0100 Subject: [PATCH] --- yaml --- r: 225535 b: refs/heads/master c: 773d1b98268a9effac047fd2ab1c47bf9f7a9e5f h: refs/heads/master i: 225533: a433dc805e6fda44941a4dbe852308102a991582 225531: 36bebdd53dcf23a58727726cf6faa1bf3419abe8 225527: 9f65d880adc9676842a2aaaa3fc0371e8f87f6da 225519: e92c907bdb42b416a71027527613f2cd3e4fbb17 225503: 3b70a2b3e5d038c7ebeab508f1b32659529e6e2a 225471: 182e9b23bcc41a94fb352c8a977b752f3ec75046 225407: ffcc0777ea2285661c7d9cdbc79b4a8b6c50da55 225279: 0c33c8976083d945b4f0c17d93a26f800aa411fb v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rt2x00/rt2x00.h | 5 ----- trunk/drivers/net/wireless/rt2x00/rt2x00mac.c | 11 ----------- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 843c43d9878e..39c9eea9da57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5235189c8edddf2eb32982f814bc858b55e6350a +refs/heads/master: 773d1b98268a9effac047fd2ab1c47bf9f7a9e5f diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00.h b/trunk/drivers/net/wireless/rt2x00/rt2x00.h index af1d3efc2949..5f7f52ff74d2 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt2x00.h +++ b/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. */ diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00mac.c b/trunk/drivers/net/wireless/rt2x00/rt2x00mac.c index 4cac7ad60f47..23250a5d8331 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt2x00mac.c +++ b/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