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

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
...@@ -247,7 +247,7 @@ static u16 chandef_to_chanspec(struct brcmu_d11inf *d11inf, ...@@ -247,7 +247,7 @@ static u16 chandef_to_chanspec(struct brcmu_d11inf *d11inf,
brcmf_dbg(TRACE, "chandef: control %d center %d width %d\n", brcmf_dbg(TRACE, "chandef: control %d center %d width %d\n",
ch->chan->center_freq, ch->center_freq1, ch->width); ch->chan->center_freq, ch->center_freq1, ch->width);
ch_inf.chnum = ieee80211_frequency_to_channel(ch->center_freq1); 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) { switch (ch->width) {
case NL80211_CHAN_WIDTH_20: case NL80211_CHAN_WIDTH_20:
case NL80211_CHAN_WIDTH_20_NOHT: case NL80211_CHAN_WIDTH_20_NOHT:
...@@ -256,24 +256,21 @@ static u16 chandef_to_chanspec(struct brcmu_d11inf *d11inf, ...@@ -256,24 +256,21 @@ static u16 chandef_to_chanspec(struct brcmu_d11inf *d11inf,
break; break;
case NL80211_CHAN_WIDTH_40: case NL80211_CHAN_WIDTH_40:
ch_inf.bw = BRCMU_CHAN_BW_40; ch_inf.bw = BRCMU_CHAN_BW_40;
if (primary_offset < 0) if (primary_offset > 0)
ch_inf.sb = BRCMU_CHAN_SB_U; ch_inf.sb = BRCMU_CHAN_SB_U;
else else
ch_inf.sb = BRCMU_CHAN_SB_L; ch_inf.sb = BRCMU_CHAN_SB_L;
break; break;
case NL80211_CHAN_WIDTH_80: case NL80211_CHAN_WIDTH_80:
ch_inf.bw = BRCMU_CHAN_BW_80; ch_inf.bw = BRCMU_CHAN_BW_80;
if (primary_offset < 0) { if (primary_offset == -30)
if (primary_offset < -CH_10MHZ_APART) ch_inf.sb = BRCMU_CHAN_SB_LL;
ch_inf.sb = BRCMU_CHAN_SB_UU; else if (primary_offset == -10)
else ch_inf.sb = BRCMU_CHAN_SB_LU;
ch_inf.sb = BRCMU_CHAN_SB_UL; else if (primary_offset == 10)
} else { ch_inf.sb = BRCMU_CHAN_SB_UL;
if (primary_offset > CH_10MHZ_APART) else
ch_inf.sb = BRCMU_CHAN_SB_LL; ch_inf.sb = BRCMU_CHAN_SB_UU;
else
ch_inf.sb = BRCMU_CHAN_SB_LU;
}
break; break;
case NL80211_CHAN_WIDTH_80P80: case NL80211_CHAN_WIDTH_80P80:
case NL80211_CHAN_WIDTH_160: case NL80211_CHAN_WIDTH_160:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment