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

Commit 140eb03f authored by Hamad Kadmany's avatar Hamad Kadmany
Browse files

net/wireless: Fix handling of supported-rates 



Handling of supported-rates was duplicated by mistake
in two separate blocks and was done twice. In addition,
in the first block handling of supported-rates in
unsupported bands is missing.

Change-Id: Ic75dfb60fa2ae2be8010e1e1ef4400279c91809f
Signed-off-by: default avatarHamad Kadmany <hkadmany@codeaurora.org>
parent 6084bf75

net/wireless/nl80211.c

+0 −17
Original line number Diff line number Diff line
@@ -5344,23 +5344,6 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info) 
		if (wiphy->bands[i])

			request->rates[i] =

				(1 << wiphy->bands[i]->n_bitrates) - 1;

	if (info->attrs[NL80211_ATTR_SCAN_SUPP_RATES]) {

		nla_for_each_nested(attr,

				    info->attrs[NL80211_ATTR_SCAN_SUPP_RATES],

				    tmp) {

			enum ieee80211_band band = nla_type(attr);

			if (band < 0 || band >= IEEE80211_NUM_BANDS) {

				err = -EINVAL;

				goto out_free;

			}

			err = ieee80211_get_ratemask(wiphy->bands[band],

						     nla_data(attr),

						     nla_len(attr),

						     &request->rates[band]);

			if (err)

				goto out_free;

		}

	}



	for (i = 0; i < IEEE80211_NUM_BANDS; i++)

		if (wiphy->bands[i])