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

Commit 93b05238 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

cfg80211: always set IBSS basic rates 



IBSS started from wireless extensions is currently
missing basic rate configuration, fix this by moving
the code to generate the default to the common code
that gets invoked for both nl80211 and wext.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent dc4769f0

net/wireless/ibss.c

+19 −0
Original line number Diff line number Diff line
@@ -88,6 +88,25 @@ int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev, 
	if (wdev->ssid_len)

		return -EALREADY;



	if (!params->basic_rates) {

		/*

		* If no rates were explicitly configured,

		* use the mandatory rate set for 11b or

		* 11a for maximum compatibility.

		*/

		struct ieee80211_supported_band *sband =

			rdev->wiphy.bands[params->channel->band];

		int j;

		u32 flag = params->channel->band == IEEE80211_BAND_5GHZ ?

			IEEE80211_RATE_MANDATORY_A :

			IEEE80211_RATE_MANDATORY_B;



		for (j = 0; j < sband->n_bitrates; j++) {

			if (sband->bitrates[j].flags & flag)

				params->basic_rates |= BIT(j);

		}

	}



	if (WARN_ON(wdev->connect_keys))

		kfree(wdev->connect_keys);

	wdev->connect_keys = connkeys;

net/wireless/nl80211.c

+0 −17
Original line number Diff line number Diff line
@@ -4119,23 +4119,6 @@ static int nl80211_join_ibss(struct sk_buff *skb, struct genl_info *info) 
				goto out;

			}

		}

	} else {

		/*

		* If no rates were explicitly configured,

		* use the mandatory rate set for 11b or

		* 11a for maximum compatibility.

		*/

		struct ieee80211_supported_band *sband =

			wiphy->bands[ibss.channel->band];

		int j;

		u32 flag = ibss.channel->band == IEEE80211_BAND_5GHZ ?

			IEEE80211_RATE_MANDATORY_A :

			IEEE80211_RATE_MANDATORY_B;



		for (j = 0; j < sband->n_bitrates; j++) {

			if (sband->bitrates[j].flags & flag)

				ibss.basic_rates |= BIT(j);

		}

	}



	err = cfg80211_join_ibss(rdev, dev, &ibss, connkeys);