Commit d18ef29f authored by Reinette Chatre's avatar Reinette Chatre Committed by John W. Linville
Browse files

mac80211: no BSS changes to driver from beacons processed during scanning 



There is no need to send BSS changes to driver from beacons processed
during scanning. We are more interested in beacons from an AP with which
we are associated - these will still be used to send updates to driver as
the beacons are received without scanning.

This change·removes the requirement that bss_info_changed needs to be atomic.
The beacons received during scanning are processed from a tasklet, but if we
do not call bss_info_changed for these beacons there is no need for it to be
atomic. This function (bss_info_changed) is called either from workqueue or
ioctl in all other instances.

Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Acked-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8d0c7fad

include/net/mac80211.h

+1 −2
Original line number Diff line number Diff line
@@ -1020,8 +1020,7 @@ enum ieee80211_ampdu_mlme_action { 
 *	level driver (e.g. assoc/disassoc status, erp parameters).

 *	This function should not be used if no BSS has been set, unless

 *	for association indication. The @changed parameter indicates which

 *	of the bss parameters has changed when a call is made. This callback

 *	has to be atomic.

 *	of the bss parameters has changed when a call is made.

 *

 * @configure_filter: Configure the device's RX filter.

 *	See the section "Frame filtering" for more information.

net/mac80211/mlme.c

+11 −5
Original line number Diff line number Diff line
@@ -2797,6 +2797,17 @@ static void ieee80211_rx_mgmt_beacon(struct net_device *dev, 


	ieee802_11_parse_elems(mgmt->u.beacon.variable, len - baselen, &elems);



	if (elems.wmm_param && (ifsta->flags & IEEE80211_STA_WMM_ENABLED)) {

		ieee80211_sta_wmm_params(dev, ifsta, elems.wmm_param,

					 elems.wmm_param_len);

	}



	/* Do not send changes to driver if we are scanning. This removes

	 * requirement that driver's bss_info_changed function needs to be

	 * atomic. */

	if (local->sta_sw_scanning || local->sta_hw_scanning)

		return;



	if (elems.erp_info && elems.erp_info_len >= 1)

		changed |= ieee80211_handle_erp_ie(sdata, elems.erp_info[0]);

	else {
@@ -2816,11 +2827,6 @@ static void ieee80211_rx_mgmt_beacon(struct net_device *dev, 
					       &bss_info);

	}



	if (elems.wmm_param && (ifsta->flags & IEEE80211_STA_WMM_ENABLED)) {

		ieee80211_sta_wmm_params(dev, ifsta, elems.wmm_param,

					 elems.wmm_param_len);

	}



	ieee80211_bss_info_change_notify(sdata, changed);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE