From: Miri Korenblit <miriam.rachel.korenblit@intel.com>
To: johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org,
Johannes Berg <johannes.berg@intel.com>,
Gregory Greenman <gregory.greenman@intel.com>
Subject: [PATCH 2/8] wifi: mac80211: simplify ieee80211_config_bw() prototype
Date: Thu, 11 Jan 2024 18:17:40 +0200 [thread overview]
Message-ID: <20240111181514.f0653cd5e7dd.I8bd5ee848074029a9f0495c95e4339546ad8fe15@changeid> (raw)
In-Reply-To: <20240111161746.3978601-1-miriam.rachel.korenblit@intel.com>
From: Johannes Berg <johannes.berg@intel.com>
The only user of this function passes a lot of pointers
directly from the parsed elements, so it's simpler to
just pass the entire elements parsing struct. This also
shows that the ht_cap is actually unused.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Gregory Greenman <gregory.greenman@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
---
net/mac80211/mlme.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 576ba6b25db9..6fa69ad3ad4f 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -489,15 +489,15 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata,
}
static int ieee80211_config_bw(struct ieee80211_link_data *link,
- const struct ieee80211_ht_cap *ht_cap,
- const struct ieee80211_vht_cap *vht_cap,
- const struct ieee80211_ht_operation *ht_oper,
- const struct ieee80211_vht_operation *vht_oper,
- const struct ieee80211_he_operation *he_oper,
- const struct ieee80211_eht_operation *eht_oper,
- const struct ieee80211_s1g_oper_ie *s1g_oper,
+ struct ieee802_11_elems *elems,
const u8 *bssid, u64 *changed)
{
+ const struct ieee80211_vht_cap *vht_cap = elems->vht_cap_elem;
+ const struct ieee80211_ht_operation *ht_oper = elems->ht_operation;
+ const struct ieee80211_vht_operation *vht_oper = elems->vht_operation;
+ const struct ieee80211_he_operation *he_oper = elems->he_operation;
+ const struct ieee80211_eht_operation *eht_oper = elems->eht_operation;
+ const struct ieee80211_s1g_oper_ie *s1g_oper = elems->s1g_oper;
struct ieee80211_sub_if_data *sdata = link->sdata;
struct ieee80211_local *local = sdata->local;
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
@@ -6433,11 +6433,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_link_data *link,
changed |= ieee80211_recalc_twt_req(sdata, sband, link, link_sta, elems);
- if (ieee80211_config_bw(link, elems->ht_cap_elem,
- elems->vht_cap_elem, elems->ht_operation,
- elems->vht_operation, elems->he_operation,
- elems->eht_operation,
- elems->s1g_oper, bssid, &changed)) {
+ if (ieee80211_config_bw(link, elems, bssid, &changed)) {
sdata_info(sdata,
"failed to follow AP %pM bandwidth change, disconnect\n",
bssid);
--
2.34.1
next prev parent reply other threads:[~2024-01-11 16:18 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-11 16:17 [PATCH 0/8] cfg80211/mac80211 patches from our internal tree 2024-01-11 Miri Korenblit
2024-01-11 16:17 ` [PATCH 1/8] wifi: mac80211_hwsim: advertise 15 simultaneous links Miri Korenblit
2024-01-11 16:17 ` Miri Korenblit [this message]
2024-01-11 16:17 ` [PATCH 3/8] wifi: mac80211: remove extra element parsing Miri Korenblit
2024-01-11 16:17 ` [PATCH 4/8] wifi: mac80211: simplify HE capability access Miri Korenblit
2024-01-11 16:17 ` [PATCH 5/8] wifi: mac80211: disallow drivers with HT wider than HE Miri Korenblit
2024-01-11 20:39 ` Jonathan Bither
2024-01-12 10:21 ` Johannes Berg
2024-01-12 17:27 ` Jonathan Bither
2024-01-12 13:10 ` Kalle Valo
2024-01-12 18:42 ` Johannes Berg
2024-01-12 19:58 ` Ben Greear
2024-01-15 22:00 ` Johannes Berg
2024-01-15 23:14 ` Ben Greear
2024-01-13 6:54 ` Kalle Valo
2024-01-11 16:17 ` [PATCH 6/8] wifi: mac80211: fix potential sta-link leak Miri Korenblit
2024-01-11 16:17 ` [PATCH 7/8] wifi: mac80211: don't set bss_conf in parsing Miri Korenblit
2024-01-11 16:17 ` [PATCH 8/8] wifi: mac80211: use deflink and fix typo in link ID check Miri Korenblit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240111181514.f0653cd5e7dd.I8bd5ee848074029a9f0495c95e4339546ad8fe15@changeid \
--to=miriam.rachel.korenblit@intel.com \
--cc=gregory.greenman@intel.com \
--cc=johannes.berg@intel.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.