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

Commit deccbe80 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-davem-2015-09-22' of... 

Merge tag 'mac80211-for-davem-2015-09-22' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
Just two small fixes:
 * VHT MCS mask array overrun, reported by Dan Carpenter
 * reset CQM history to always get a notification, from Sara Sharon
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a46496ce babc305e

net/mac80211/cfg.c

+8 −5
Original line number Diff line number Diff line
@@ -2474,6 +2474,7 @@ static int ieee80211_set_cqm_rssi_config(struct wiphy *wiphy, 


	bss_conf->cqm_rssi_thold = rssi_thold;

	bss_conf->cqm_rssi_hyst = rssi_hyst;

	sdata->u.mgd.last_cqm_event_signal = 0;



	/* tell the driver upon association, unless already associated */

	if (sdata->u.mgd.associated &&
@@ -2518,17 +2519,19 @@ static int ieee80211_set_bitrate_mask(struct wiphy *wiphy, 
			continue;



		for (j = 0; j < IEEE80211_HT_MCS_MASK_LEN; j++) {

			if (~sdata->rc_rateidx_mcs_mask[i][j])

			if (~sdata->rc_rateidx_mcs_mask[i][j]) {

				sdata->rc_has_mcs_mask[i] = true;

				break;

			}

		}



			if (~sdata->rc_rateidx_vht_mcs_mask[i][j])

		for (j = 0; j < NL80211_VHT_NSS_MAX; j++) {

			if (~sdata->rc_rateidx_vht_mcs_mask[i][j]) {

				sdata->rc_has_vht_mcs_mask[i] = true;



			if (sdata->rc_has_mcs_mask[i] &&

			    sdata->rc_has_vht_mcs_mask[i])

				break;

			}

		}

	}



	return 0;

}