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

Commit 6e186166 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcmfmac: add function converting ieee80211_channel to chanspec 



The firmware carries channel information in a different format
as the provided ieee80211_channel structure. Conversion is needed
when receiving requests from cfg80211 carrying ieee80211_channel
structures. This patch adds a utility function to do that.

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ec5a07d5

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

+27 −25
Original line number Diff line number Diff line
@@ -392,6 +392,31 @@ static u8 brcmf_mw_to_qdbm(u16 mw) 
	return qdbm;

}



static u16 channel_to_chanspec(struct ieee80211_channel *ch)

{

	u16 chanspec;



	chanspec = ieee80211_frequency_to_channel(ch->center_freq);

	chanspec &= WL_CHANSPEC_CHAN_MASK;



	if (ch->band == IEEE80211_BAND_2GHZ)

		chanspec |= WL_CHANSPEC_BAND_2G;

	else

		chanspec |= WL_CHANSPEC_BAND_5G;



	if (ch->flags & IEEE80211_CHAN_NO_HT40) {

		chanspec |= WL_CHANSPEC_BW_20;

		chanspec |= WL_CHANSPEC_CTL_SB_NONE;

	} else {

		chanspec |= WL_CHANSPEC_BW_40;

		if (ch->flags & IEEE80211_CHAN_NO_HT40PLUS)

			chanspec |= WL_CHANSPEC_CTL_SB_LOWER;

		else

			chanspec |= WL_CHANSPEC_CTL_SB_UPPER;

	}

	return chanspec;

}



static void convert_key_from_CPU(struct brcmf_wsec_key *key,

				 struct brcmf_wsec_key_le *key_le)

{
@@ -701,8 +726,6 @@ static void brcmf_escan_prep(struct brcmf_scan_params_le *params_le, 
	s32 i;

	s32 offset;

	u16 chanspec;

	u16 channel;

	struct ieee80211_channel *req_channel;

	char *ptr;

	struct brcmf_ssid_le ssid_le;
@@ -726,30 +749,9 @@ static void brcmf_escan_prep(struct brcmf_scan_params_le *params_le, 
	WL_SCAN("### List of channelspecs to scan ### %d\n", n_channels);

	if (n_channels > 0) {

		for (i = 0; i < n_channels; i++) {

			chanspec = 0;

			req_channel = request->channels[i];

			channel = ieee80211_frequency_to_channel(

					req_channel->center_freq);

			if (req_channel->band == IEEE80211_BAND_2GHZ)

				chanspec |= WL_CHANSPEC_BAND_2G;

			else

				chanspec |= WL_CHANSPEC_BAND_5G;



			if (req_channel->flags & IEEE80211_CHAN_NO_HT40) {

				chanspec |= WL_CHANSPEC_BW_20;

				chanspec |= WL_CHANSPEC_CTL_SB_NONE;

			} else {

				chanspec |= WL_CHANSPEC_BW_40;

				if (req_channel->flags &

						IEEE80211_CHAN_NO_HT40PLUS)

					chanspec |= WL_CHANSPEC_CTL_SB_LOWER;

				else

					chanspec |= WL_CHANSPEC_CTL_SB_UPPER;

			}



			chanspec |= (channel & WL_CHANSPEC_CHAN_MASK);

			chanspec = channel_to_chanspec(request->channels[i]);

			WL_SCAN("Chan : %d, Channel spec: %x\n",

				channel, chanspec);

				request->channels[i]->hw_value, chanspec);

			params_le->channel_list[i] = cpu_to_le16(chanspec);

		}

	} else {