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

Commit 8cdc196b authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge remote-tracking branch 'mac80211/master' into HEAD

parents 03395003 3d9646d0

net/mac80211/cfg.c

+2 −1
Original line number Diff line number Diff line
@@ -2088,7 +2088,8 @@ static int ieee80211_set_mcast_rate(struct wiphy *wiphy, struct net_device *dev, 
{

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);



	memcpy(sdata->vif.bss_conf.mcast_rate, rate, sizeof(rate));

	memcpy(sdata->vif.bss_conf.mcast_rate, rate,

	       sizeof(int) * IEEE80211_NUM_BANDS);



	return 0;

}

net/mac80211/mlme.c

+7 −4
Original line number Diff line number Diff line
@@ -3488,6 +3488,7 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata, 


	ret = 0;



out:

	while (!cfg80211_chandef_usable(sdata->local->hw.wiphy, chandef,

					IEEE80211_CHAN_DISABLED)) {

		if (WARN_ON(chandef->width == NL80211_CHAN_WIDTH_20_NOHT)) {
@@ -3496,14 +3497,13 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata, 
			goto out;

		}



		ret = chandef_downgrade(chandef);

		ret |= chandef_downgrade(chandef);

	}



	if (chandef->width != vht_chandef.width)

		sdata_info(sdata,

			   "local regulatory prevented using AP HT/VHT configuration, downgraded\n");

			   "capabilities/regulatory prevented using AP HT/VHT configuration, downgraded\n");



out:

	WARN_ON_ONCE(!cfg80211_chandef_valid(chandef));

	return ret;

}
@@ -3617,8 +3617,11 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata, 
	 */

	ret = ieee80211_vif_use_channel(sdata, &chandef,

					IEEE80211_CHANCTX_SHARED);

	while (ret && chandef.width != NL80211_CHAN_WIDTH_20_NOHT)

	while (ret && chandef.width != NL80211_CHAN_WIDTH_20_NOHT) {

		ifmgd->flags |= chandef_downgrade(&chandef);

		ret = ieee80211_vif_use_channel(sdata, &chandef,

						IEEE80211_CHANCTX_SHARED);

	}

	return ret;

}

net/wireless/scan.c

+1 −1
Original line number Diff line number Diff line
@@ -1398,7 +1398,7 @@ ieee80211_bss(struct wiphy *wiphy, struct iw_request_info *info, 
						  &iwe, IW_EV_UINT_LEN);

	}



	buf = kmalloc(30, GFP_ATOMIC);

	buf = kmalloc(31, GFP_ATOMIC);

	if (buf) {

		memset(&iwe, 0, sizeof(iwe));

		iwe.cmd = IWEVCUSTOM;