| Message ID | 1588285252-30034-10-git-send-email-rmanohar@codeaurora.org (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | [v2,01/11] cfg80211: use only HE capability to set prohibited flags in 6 GHz | expand |
> diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c > index b4dfefd482a6..9115dc9c7d78 100644 > --- a/net/mac80211/mlme.c > +++ b/net/mac80211/mlme.c > @@ -163,6 +163,9 @@ ieee80211_determine_chantype(struct > ieee80211_sub_if_data *sdata, > chandef->width = NL80211_CHAN_WIDTH_20_NOHT; > chandef->center_freq1 = channel->center_freq; > > + if (channel->band == NL80211_BAND_6GHZ) > + goto skip_ht_vht_oper; > + > if (!ht_oper || !sta_ht_cap.ht_supported) { > ret = IEEE80211_STA_DISABLE_HT | > IEEE80211_STA_DISABLE_VHT | > @@ -263,6 +266,15 @@ ieee80211_determine_chantype(struct > ieee80211_sub_if_data *sdata, > > *chandef = vht_chandef; > > +skip_ht_vht_oper: > + if (!ieee80211_chandef_he_oper(sdata, he_oper, chandef)) { > + if (!(ifmgd->flags & IEEE80211_STA_DISABLE_HE)) > + sdata_info(sdata, > + "AP HE information is invalid, disable HE\n"); > + ret = IEEE80211_STA_DISABLE_HE; > + goto out; > + } > + Hi Rajkumar, Above is causing to disable HE in STA mode even when AP supports HE. Shouldn't this be done only for 6GHz band? something like below? if (channel->band == NL80211_BAND_6GHZ && !ieee80211_chandef_he_oper(sdata, he_oper, chandef)) > ret = 0; > > out: > diff --git a/net/mac80211/util.c b/net/mac80211/util.c > index 90b8c42b1aa8..660cf52913f1 100644 > --- a/net/mac80211/util.c > +++ b/net/mac80211/util.c > @@ -3170,6 +3170,98 @@ bool ieee80211_chandef_vht_oper(struct > ieee80211_hw *hw, > return true; > } > > +bool ieee80211_chandef_he_oper(struct ieee80211_sub_if_data *sdata, > + const struct ieee80211_he_operation *heop, > + struct cfg80211_chan_def *chandef) > +{ > + struct ieee80211_he_oper_6ghz_op_info info; > + const struct ieee80211_sta_he_cap *he_cap; > + struct ieee80211_supported_band *sband; > + struct cfg80211_chan_def new = *chandef; > + int cf0, cf1; > + int ccf0, ccf1; > + bool support_80_80; > + bool support_160; > + u8 he_phy_cap; > + u8 pos = 0; > + > + if (!heop) > + return false; > + > + sband = ieee80211_get_sband(sdata); > + if (!sband) > + return false; > + > + he_cap = ieee80211_get_he_iftype_cap(sband, sdata->vif.type); > + if (!he_cap) > + return false; > + or return true here if band is not NL80211_BAND_6GHZ? > + if (!(le32_to_cpu(heop->he_oper_params) & > + IEEE80211_HE_OPERATION_6GHZ_OP_INFO)) > + return false; > +
On 2020-05-08 15:53, Pradeep Kumar Chitrapu wrote: >> diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c >> index b4dfefd482a6..9115dc9c7d78 100644 >> --- a/net/mac80211/mlme.c >> +++ b/net/mac80211/mlme.c >> @@ -163,6 +163,9 @@ ieee80211_determine_chantype(struct >> ieee80211_sub_if_data *sdata, >> chandef->width = NL80211_CHAN_WIDTH_20_NOHT; >> chandef->center_freq1 = channel->center_freq; >> >> + if (channel->band == NL80211_BAND_6GHZ) >> + goto skip_ht_vht_oper; >> + >> if (!ht_oper || !sta_ht_cap.ht_supported) { >> ret = IEEE80211_STA_DISABLE_HT | >> IEEE80211_STA_DISABLE_VHT | >> @@ -263,6 +266,15 @@ ieee80211_determine_chantype(struct >> ieee80211_sub_if_data *sdata, >> >> *chandef = vht_chandef; >> >> +skip_ht_vht_oper: >> + if (!ieee80211_chandef_he_oper(sdata, he_oper, chandef)) { >> + if (!(ifmgd->flags & IEEE80211_STA_DISABLE_HE)) >> + sdata_info(sdata, >> + "AP HE information is invalid, disable HE\n"); >> + ret = IEEE80211_STA_DISABLE_HE; >> + goto out; >> + } >> + > Hi Rajkumar, > Above is causing to disable HE in STA mode even when AP supports HE. > Shouldn't this be done only for 6GHz band? > something like below? > if (channel->band == NL80211_BAND_6GHZ && > !ieee80211_chandef_he_oper(sdata, he_oper, chandef)) > Good catch. >> + >> + he_cap = ieee80211_get_he_iftype_cap(sband, sdata->vif.type); >> + if (!he_cap) >> + return false; >> + > or return true here if band is not NL80211_BAND_6GHZ? > Make sense. Will address it. -Rajkumar
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 0bb442feb1db..42a7782c973a 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -2194,6 +2194,9 @@ bool ieee80211_chandef_vht_oper(struct ieee80211_hw *hw, const struct ieee80211_vht_operation *oper, const struct ieee80211_ht_operation *htop, struct cfg80211_chan_def *chandef); +bool ieee80211_chandef_he_oper(struct ieee80211_sub_if_data *sdata, + const struct ieee80211_he_operation *heop, + struct cfg80211_chan_def *chandef); u32 ieee80211_chandef_downgrade(struct cfg80211_chan_def *c); int __must_check diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 04d3da733bc8..0521b57939e1 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -99,6 +99,7 @@ bool mesh_matches_local(struct ieee80211_sub_if_data *sdata, ieee80211_chandef_vht_oper(&sdata->local->hw, ie->vht_operation, ie->ht_operation, &sta_chan_def); + ieee80211_chandef_he_oper(sdata, ie->he_operation, &sta_chan_def); if (!cfg80211_chandef_compatible(&sdata->vif.bss_conf.chandef, &sta_chan_def)) diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index b4dfefd482a6..9115dc9c7d78 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -163,6 +163,9 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata, chandef->width = NL80211_CHAN_WIDTH_20_NOHT; chandef->center_freq1 = channel->center_freq; + if (channel->band == NL80211_BAND_6GHZ) + goto skip_ht_vht_oper; + if (!ht_oper || !sta_ht_cap.ht_supported) { ret = IEEE80211_STA_DISABLE_HT | IEEE80211_STA_DISABLE_VHT | @@ -263,6 +266,15 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata, *chandef = vht_chandef; +skip_ht_vht_oper: + if (!ieee80211_chandef_he_oper(sdata, he_oper, chandef)) { + if (!(ifmgd->flags & IEEE80211_STA_DISABLE_HE)) + sdata_info(sdata, + "AP HE information is invalid, disable HE\n"); + ret = IEEE80211_STA_DISABLE_HE; + goto out; + } + ret = 0; out: diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 90b8c42b1aa8..660cf52913f1 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -3170,6 +3170,98 @@ bool ieee80211_chandef_vht_oper(struct ieee80211_hw *hw, return true; } +bool ieee80211_chandef_he_oper(struct ieee80211_sub_if_data *sdata, + const struct ieee80211_he_operation *heop, + struct cfg80211_chan_def *chandef) +{ + struct ieee80211_he_oper_6ghz_op_info info; + const struct ieee80211_sta_he_cap *he_cap; + struct ieee80211_supported_band *sband; + struct cfg80211_chan_def new = *chandef; + int cf0, cf1; + int ccf0, ccf1; + bool support_80_80; + bool support_160; + u8 he_phy_cap; + u8 pos = 0; + + if (!heop) + return false; + + sband = ieee80211_get_sband(sdata); + if (!sband) + return false; + + he_cap = ieee80211_get_he_iftype_cap(sband, sdata->vif.type); + if (!he_cap) + return false; + + if (!(le32_to_cpu(heop->he_oper_params) & + IEEE80211_HE_OPERATION_6GHZ_OP_INFO)) + return false; + + he_phy_cap = he_cap->he_cap_elem.phy_cap_info[0]; + support_160 = + !!(he_phy_cap & + IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G); + support_80_80 = + !!(he_phy_cap & + IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G); + + if (le32_to_cpu(heop->he_oper_params) & + IEEE80211_HE_OPERATION_VHT_OPER_INFO) + pos += 3; + if (le32_to_cpu(heop->he_oper_params) & + IEEE80211_HE_OPERATION_CO_HOSTED_BSS) + pos += 1; + + memcpy(&info, &heop->optional[pos], sizeof(info)); + ccf0 = info.center_freq_seg0_idx; + ccf1 = info.center_freq_seg1_idx; + + cf0 = ieee80211_channel_to_frequency(ccf0, chandef->chan->band); + cf1 = ieee80211_channel_to_frequency(ccf1, chandef->chan->band); + + switch (info.control & 0x3) { + case IEEE80211_HE_6GHZ_CHANWIDTH_20MHZ: + new.center_freq1 = cf0; + new.width = NL80211_CHAN_WIDTH_20; + break; + case IEEE80211_HE_6GHZ_CHANWIDTH_40MHZ: + new.center_freq1 = cf0; + new.width = NL80211_CHAN_WIDTH_40; + break; + case IEEE80211_HE_6GHZ_CHANWIDTH_80MHZ: + new.center_freq1 = cf0; + new.width = NL80211_CHAN_WIDTH_80; + break; + case IEEE80211_HE_6GHZ_CHANWIDTH_160MHZ_80P80MHZ: + new.center_freq1 = cf0; + new.width = NL80211_CHAN_WIDTH_80; + if (ccf1) { + unsigned int diff; + + diff = abs(ccf1 - ccf0); + if (diff == 8 && support_160) { + new.width = NL80211_CHAN_WIDTH_160; + new.center_freq1 = cf1; + } else if ((diff > 8) && support_80_80) { + new.width = NL80211_CHAN_WIDTH_80P80; + new.center_freq2 = cf1; + } + } + break; + default: + return false; + } + + if (!cfg80211_chandef_valid(&new)) + return false; + + *chandef = new; + return true; +} + int ieee80211_parse_bitrates(struct cfg80211_chan_def *chandef, const struct ieee80211_supported_band *sband, const u8 *srates, int srates_len, u32 *rates)
In 6 GHz band, determine chandef from 6 GHz operation information of HE operation element. Signed-off-by: Rajkumar Manoharan <rmanohar@codeaurora.org> --- net/mac80211/ieee80211_i.h | 3 ++ net/mac80211/mesh.c | 1 + net/mac80211/mlme.c | 12 ++++++ net/mac80211/util.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 108 insertions(+)