Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ed7a17a authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Remove unneeded variable 



The update_bssid is set only when BSS_CHANGED_BSSID is used,
but the check if that field is true is done later in the function
but also only when BSS_CHANGED_BSSID is set. This makes the
variable useless, as it can never result in a negative check.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Acked-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f1aa4c54

drivers/net/wireless/rt2x00/rt2x00mac.c

+2 −5
Original line number Diff line number Diff line
@@ -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.