Skip to content

L
linux
Commit 7781f0d8 authored by Johannes Berg's avatar Johannes Berg
Browse files
Options

wifi: mac80211: mlme: refactor ieee80211_prep_channel() a bit 

Refactor ieee80211_prep_channel() to make the link argument
optional and add a conn_flags pointer argument instead, so
that we can later use this for links that don't exist yet
to build the right information for MLO.
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 978420c2
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 37 deletions
net/mac80211/mlme.c
View file @ 7781f0d8
...@@ -3888,7 +3888,8 @@ ieee80211_verify_sta_he_mcs_support(struct ieee80211_sub_if_data *sdata, ...@@ -3888,7 +3888,8 @@ ieee80211_verify_sta_he_mcs_support(struct ieee80211_sub_if_data *sdata,
static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata, static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
struct ieee80211_link_data *link, struct ieee80211_link_data *link,
struct cfg80211_bss *cbss) struct cfg80211_bss *cbss,
ieee80211_conn_flags_t *conn_flags)
{ {
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
const struct ieee80211_ht_cap *ht_cap = NULL; const struct ieee80211_ht_cap *ht_cap = NULL;
...@@ -3919,73 +3920,73 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata, ...@@ -3919,73 +3920,73 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
sband = local->hw.wiphy->bands[cbss->channel->band]; sband = local->hw.wiphy->bands[cbss->channel->band];
link->u.mgd.conn_flags &= ~(IEEE80211_CONN_DISABLE_40MHZ | *conn_flags &= ~(IEEE80211_CONN_DISABLE_40MHZ |
IEEE80211_CONN_DISABLE_80P80MHZ | IEEE80211_CONN_DISABLE_80P80MHZ |
IEEE80211_CONN_DISABLE_160MHZ); IEEE80211_CONN_DISABLE_160MHZ);
/* disable HT/VHT/HE if we don't support them */ /* disable HT/VHT/HE if we don't support them */
if (!sband->ht_cap.ht_supported && !is_6ghz) { if (!sband->ht_cap.ht_supported && !is_6ghz) {
mlme_dbg(sdata, "HT not supported, disabling HT/VHT/HE/EHT\n"); mlme_dbg(sdata, "HT not supported, disabling HT/VHT/HE/EHT\n");
link->u.mgd.conn_flags |= IEEE80211_CONN_DISABLE_HT; *conn_flags |= IEEE80211_CONN_DISABLE_HT;
link->u.mgd.conn_flags |= IEEE80211_CONN_DISABLE_VHT; *conn_flags |= IEEE80211_CONN_DISABLE_VHT;
link->u.mgd.conn_flags |= IEEE80211_CONN_DISABLE_HE; *conn_flags |= IEEE80211_CONN_DISABLE_HE;
link->u.mgd.conn_flags |= IEEE80211_CONN_DISABLE_EHT; *conn_flags |= IEEE80211_CONN_DISABLE_EHT;
} }
if (!sband->vht_cap.vht_supported && is_5ghz) { if (!sband->vht_cap.vht_supported && is_5ghz) {
mlme_dbg(sdata, "VHT not supported, disabling VHT/HE/EHT\n"); mlme_dbg(sdata, "VHT not supported, disabling VHT/HE/EHT\n");
link->u.mgd.conn_flags |= IEEE80211_CONN_DISABLE_VHT; *conn_flags |= IEEE80211_CONN_DISABLE_VHT;
link->u.mgd.conn_flags |= IEEE80211_CONN_DISABLE_HE; *conn_flags |= IEEE80211_CONN_DISABLE_HE;
link->u.mgd.conn_flags |= IEEE80211_CONN_DISABLE_EHT; *conn_flags |= IEEE80211_CONN_DISABLE_EHT;
} }
if (!ieee80211_get_he_iftype_cap(sband, if (!ieee80211_get_he_iftype_cap(sband,
ieee80211_vif_type_p2p(&sdata->vif))) { ieee80211_vif_type_p2p(&sdata->vif))) {
mlme_dbg(sdata, "HE not supported, disabling HE and EHT\n"); mlme_dbg(sdata, "HE not supported, disabling HE and EHT\n");
link->u.mgd.conn_flags |= IEEE80211_CONN_DISABLE_HE; *conn_flags |= IEEE80211_CONN_DISABLE_HE;
link->u.mgd.conn_flags |= IEEE80211_CONN_DISABLE_EHT; *conn_flags |= IEEE80211_CONN_DISABLE_EHT;
} }
if (!ieee80211_get_eht_iftype_cap(sband, if (!ieee80211_get_eht_iftype_cap(sband,
ieee80211_vif_type_p2p(&sdata->vif))) { ieee80211_vif_type_p2p(&sdata->vif))) {
mlme_dbg(sdata, "EHT not supported, disabling EHT\n"); mlme_dbg(sdata, "EHT not supported, disabling EHT\n");
link->u.mgd.conn_flags |= IEEE80211_CONN_DISABLE_EHT; *conn_flags |= IEEE80211_CONN_DISABLE_EHT;
} }
if (!(link->u.mgd.conn_flags & IEEE80211_CONN_DISABLE_HT) && !is_6ghz) { if (!(*conn_flags & IEEE80211_CONN_DISABLE_HT) && !is_6ghz) {
ht_oper = elems->ht_operation; ht_oper = elems->ht_operation;
ht_cap = elems->ht_cap_elem; ht_cap = elems->ht_cap_elem;
if (!ht_cap) { if (!ht_cap) {
link->u.mgd.conn_flags |= IEEE80211_CONN_DISABLE_HT; *conn_flags |= IEEE80211_CONN_DISABLE_HT;
ht_oper = NULL; ht_oper = NULL;
} }
} }
if (!(link->u.mgd.conn_flags & IEEE80211_CONN_DISABLE_VHT) && !is_6ghz) { if (!(*conn_flags & IEEE80211_CONN_DISABLE_VHT) && !is_6ghz) {
vht_oper = elems->vht_operation; vht_oper = elems->vht_operation;
if (vht_oper && !ht_oper) { if (vht_oper && !ht_oper) {
vht_oper = NULL; vht_oper = NULL;
sdata_info(sdata, sdata_info(sdata,
"AP advertised VHT without HT, disabling HT/VHT/HE\n"); "AP advertised VHT without HT, disabling HT/VHT/HE\n");
link->u.mgd.conn_flags |= IEEE80211_CONN_DISABLE_HT; *conn_flags |= IEEE80211_CONN_DISABLE_HT;
link->u.mgd.conn_flags |= IEEE80211_CONN_DISABLE_VHT; *conn_flags |= IEEE80211_CONN_DISABLE_VHT;
link->u.mgd.conn_flags |= IEEE80211_CONN_DISABLE_HE; *conn_flags |= IEEE80211_CONN_DISABLE_HE;
link->u.mgd.conn_flags |= IEEE80211_CONN_DISABLE_EHT; *conn_flags |= IEEE80211_CONN_DISABLE_EHT;
} }
if (!elems->vht_cap_elem) { if (!elems->vht_cap_elem) {
sdata_info(sdata, sdata_info(sdata,
"bad VHT capabilities, disabling VHT\n"); "bad VHT capabilities, disabling VHT\n");
link->u.mgd.conn_flags |= IEEE80211_CONN_DISABLE_VHT; *conn_flags |= IEEE80211_CONN_DISABLE_VHT;
vht_oper = NULL; vht_oper = NULL;
} }
} }
if (!(link->u.mgd.conn_flags & IEEE80211_CONN_DISABLE_HE)) { if (!(*conn_flags & IEEE80211_CONN_DISABLE_HE)) {
he_oper = elems->he_operation; he_oper = elems->he_operation;
if (is_6ghz) { if (link && is_6ghz) {
struct ieee80211_bss_conf *bss_conf; struct ieee80211_bss_conf *bss_conf;
u8 j = 0; u8 j = 0;
...@@ -4011,8 +4012,8 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata, ...@@ -4011,8 +4012,8 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
if (!ieee80211_verify_peer_he_mcs_support(sdata, ies, he_oper) || if (!ieee80211_verify_peer_he_mcs_support(sdata, ies, he_oper) ||
!ieee80211_verify_sta_he_mcs_support(sdata, sband, he_oper)) !ieee80211_verify_sta_he_mcs_support(sdata, sband, he_oper))
link->u.mgd.conn_flags |= IEEE80211_CONN_DISABLE_HE | *conn_flags |= IEEE80211_CONN_DISABLE_HE |
IEEE80211_CONN_DISABLE_EHT; IEEE80211_CONN_DISABLE_EHT;
} }
/* /*
...@@ -4021,7 +4022,7 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata, ...@@ -4021,7 +4022,7 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
* both the 6 GHz operation information (from the HE operation IE) and * both the 6 GHz operation information (from the HE operation IE) and
* EHT operation. * EHT operation.
*/ */
if (!(link->u.mgd.conn_flags & if (!(*conn_flags &
(IEEE80211_CONN_DISABLE_HE | (IEEE80211_CONN_DISABLE_HE |
IEEE80211_CONN_DISABLE_EHT)) && IEEE80211_CONN_DISABLE_EHT)) &&
he_oper) { he_oper) {
...@@ -4051,7 +4052,7 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata, ...@@ -4051,7 +4052,7 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
if (!have_80mhz) { if (!have_80mhz) {
sdata_info(sdata, "80 MHz not supported, disabling VHT\n"); sdata_info(sdata, "80 MHz not supported, disabling VHT\n");
link->u.mgd.conn_flags |= IEEE80211_CONN_DISABLE_VHT; *conn_flags |= IEEE80211_CONN_DISABLE_VHT;
} }
if (sband->band == NL80211_BAND_S1GHZ) { if (sband->band == NL80211_BAND_S1GHZ) {
...@@ -4061,29 +4062,34 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata, ...@@ -4061,29 +4062,34 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
"AP missing S1G operation element?\n"); "AP missing S1G operation element?\n");
} }
link->u.mgd.conn_flags |= *conn_flags |=
ieee80211_determine_chantype(sdata, link, ieee80211_determine_chantype(sdata, link, *conn_flags,
link->u.mgd.conn_flags, sband,
sband, cbss->channel, cbss->channel,
bss->vht_cap_info, bss->vht_cap_info,
ht_oper, vht_oper, ht_oper, vht_oper,
he_oper, eht_oper, he_oper, eht_oper,
s1g_oper, s1g_oper,
&chandef, false); &chandef, false);
link->needed_rx_chains = if (link)
min(ieee80211_max_rx_chains(link, cbss), local->rx_chains); link->needed_rx_chains =
min(ieee80211_max_rx_chains(link, cbss),
local->rx_chains);
rcu_read_unlock(); rcu_read_unlock();
/* the element data was RCU protected so no longer valid anyway */ /* the element data was RCU protected so no longer valid anyway */
kfree(elems); kfree(elems);
elems = NULL; elems = NULL;
if (link->u.mgd.conn_flags & IEEE80211_CONN_DISABLE_HE && is_6ghz) { if (*conn_flags & IEEE80211_CONN_DISABLE_HE && is_6ghz) {
sdata_info(sdata, "Rejecting non-HE 6/7 GHz connection"); sdata_info(sdata, "Rejecting non-HE 6/7 GHz connection");
return -EINVAL; return -EINVAL;
} }
if (!link)
return 0;
/* will change later if needed */ /* will change later if needed */
link->smps_mode = IEEE80211_SMPS_OFF; link->smps_mode = IEEE80211_SMPS_OFF;
...@@ -4102,7 +4108,7 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata, ...@@ -4102,7 +4108,7 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
goto out; goto out;
while (ret && chandef.width != NL80211_CHAN_WIDTH_20_NOHT) { while (ret && chandef.width != NL80211_CHAN_WIDTH_20_NOHT) {
link->u.mgd.conn_flags |= *conn_flags |=
ieee80211_chandef_downgrade(&chandef); ieee80211_chandef_downgrade(&chandef);
ret = ieee80211_link_use_channel(link, &chandef, ret = ieee80211_link_use_channel(link, &chandef,
IEEE80211_CHANCTX_SHARED); IEEE80211_CHANCTX_SHARED);
...@@ -5930,7 +5936,8 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata, ...@@ -5930,7 +5936,8 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
} }
if (new_sta || override) { if (new_sta || override) {
err = ieee80211_prep_channel(sdata, link, cbss); err = ieee80211_prep_channel(sdata, link, cbss,
&link->u.mgd.conn_flags);
if (err) { if (err) {
if (new_sta) if (new_sta)
sta_info_free(local, new_sta); sta_info_free(local, new_sta);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7