|
@@ -563,7 +563,6 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
|
|
|
{
|
|
|
struct rt2x00_dev *rt2x00dev = hw->priv;
|
|
|
struct rt2x00_intf *intf = vif_to_intf(vif);
|
|
|
- int update_bssid = 0;
|
|
|
|
|
|
/*
|
|
|
* mac80211 might be calling this function while we are trying
|
|
@@ -578,10 +577,8 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
|
|
|
* conf->bssid can be NULL if coming from the internal
|
|
|
* beacon update routine.
|
|
|
*/
|
|
|
- if (changes & BSS_CHANGED_BSSID) {
|
|
|
- update_bssid = 1;
|
|
|
+ if (changes & BSS_CHANGED_BSSID)
|
|
|
memcpy(&intf->bssid, bss_conf->bssid, ETH_ALEN);
|
|
|
- }
|
|
|
|
|
|
spin_unlock(&intf->lock);
|
|
|
|
|
@@ -593,7 +590,7 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
|
|
|
*/
|
|
|
if (changes & BSS_CHANGED_BSSID)
|
|
|
rt2x00lib_config_intf(rt2x00dev, intf, vif->type, NULL,
|
|
|
- update_bssid ? bss_conf->bssid : NULL);
|
|
|
+ bss_conf->bssid);
|
|
|
|
|
|
/*
|
|
|
* Update the beacon.
|