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

Commit 36e8072e authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Kalle Valo
Browse files

brcmfmac: fix setting primary channel for 80 MHz width 



First of all it changes the way we calculate primary channel offset. If
we use e.g. 80 MHz channel with primary frequency 5180 MHz (which means
center frequency is 5210 MHz) it makes sense to calculate primary offset
as -30 MHz.
Then it fixes values we compare primary_offset with. We were comparing
offset in MHz against -2 or 2 which was resulting in picking a wrong
primary channel.

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent b3c47afb

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

+10 −13
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static u16 chandef_to_chanspec(struct brcmu_d11inf *d11inf, 
	brcmf_dbg(TRACE, "chandef: control %d center %d width %d\n",

		  ch->chan->center_freq, ch->center_freq1, ch->width);

	ch_inf.chnum = ieee80211_frequency_to_channel(ch->center_freq1);

	primary_offset = ch->center_freq1 - ch->chan->center_freq;

	primary_offset = ch->chan->center_freq - ch->center_freq1;

	switch (ch->width) {

	case NL80211_CHAN_WIDTH_20:

	case NL80211_CHAN_WIDTH_20_NOHT:
@@ -256,24 +256,21 @@ static u16 chandef_to_chanspec(struct brcmu_d11inf *d11inf, 
		break;

	case NL80211_CHAN_WIDTH_40:

		ch_inf.bw = BRCMU_CHAN_BW_40;

		if (primary_offset < 0)

		if (primary_offset > 0)

			ch_inf.sb = BRCMU_CHAN_SB_U;

		else

			ch_inf.sb = BRCMU_CHAN_SB_L;

		break;

	case NL80211_CHAN_WIDTH_80:

		ch_inf.bw = BRCMU_CHAN_BW_80;

		if (primary_offset < 0) {

			if (primary_offset < -CH_10MHZ_APART)

				ch_inf.sb = BRCMU_CHAN_SB_UU;

			else

				ch_inf.sb = BRCMU_CHAN_SB_UL;

		} else {

			if (primary_offset > CH_10MHZ_APART)

		if (primary_offset == -30)

			ch_inf.sb = BRCMU_CHAN_SB_LL;

			else

		else if (primary_offset == -10)

			ch_inf.sb = BRCMU_CHAN_SB_LU;

		}

		else if (primary_offset == 10)

			ch_inf.sb = BRCMU_CHAN_SB_UL;

		else

			ch_inf.sb = BRCMU_CHAN_SB_UU;

		break;

	case NL80211_CHAN_WIDTH_80P80:

	case NL80211_CHAN_WIDTH_160: