From nobody Fri Jun 14 18:43:06 2024
X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W17Sp52Fmz5PK14;
Fri, 14 Jun 2024 18:43:06 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4W17Sp3KCqz4GMN;
Fri, 14 Jun 2024 18:43:06 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718390586;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=NhbBz6bk2zNPoPHBWPc6Al13a+ewSLwFFenUzp4Vchw=;
b=Yyn8dfawrTsJUm0hC1+zztofzyWrbe4qczYRpuCgQZxxXsvao0OjwMmbbSnst583ksC7IO
wN/8KLRWB7nCDjy25D1RaGWIldfIjPaJp9Bu+4QI+iG/S5lKEcUYMuHlUhd414qEox5m1s
YgWYqJZXzaWjVOyxkk4Gf0dVVA/DP/Yx1AQQrFIGmTkixVpnbNa6sv20+cuhPw2aKIn8hC
2AB9Dl7ryztOe4F974qlcY3rNzoL1KO94YSfKurXo/iqMTnAjLM6hdVZQp2OQ9BikBQOCZ
/FftxdPM6JmTAaEpvACh5g8I9yruRKx5v+CxmoLaXf7SVEuIFL+uS27GJkI31w==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718390586; a=rsa-sha256; cv=none;
b=N1cZTYXSGdDqMJsXay5CxaFlKsqXZ5i9SeeFiNFMkdz7FxbSjLOcQLJwz6GUr0i4l6UfOe
XIElhtUmUb2jXB9mGKhzczCoPNMXe+XXRgtrByiyMRaldzcIE+nftWCnkaPKdc5F/RFi2D
0Nu3KCm9nLqzcfJgpdZH0fZQm3hNPVZxF6SnQh6mHq8n/WpbL4YzJyUeOwG30fQcK7/wMg
UPbRqCFBtoWQB+ZV9dLhjwX4fey922x5UWDHYrdl9mG9LA2BLYNpM/VAWI4PXt/c9U/sbN
ugF8pyoOD8k29I9b2gy3AtchEvmrpX2X0M2f+/lsnpTC0cm4OiARpW8yJ8Frpw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1718390586;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=NhbBz6bk2zNPoPHBWPc6Al13a+ewSLwFFenUzp4Vchw=;
b=Vgn+fY5y7G5kiDU1qKjl180fxut6E3QMSkTvJmAFoPHHkESrPH/6KDs26BdDmpvioQDjwy
gigP4leA8YvLFIioAmbNgk4isE3dSTwEbfZqLeXnazxC/yEh1AeKHRKxVU9q0fcqBoj04q
7XVvR8ETsSQD1hBufCJcCrVjLG6gw3Dn8Vq861xTn3mB69R9ncf2dL5WRdkjSSHdN7Psfe
RAhS+kow7WojZNIlrKlDg5shR14iQ2G9XuZJkegoG66kR7Fmy+A+Nh2OP0CLq5cdO9DC/0
p5osE9hc4YsPJrCwLVyuqtsESVKgNjMRNHBJsib3mdWwKiy1uLT9HziWwdYArg==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W17Sp2xnQzXh6;
Fri, 14 Jun 2024 18:43:06 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45EIh6IP020655;
Fri, 14 Jun 2024 18:43:06 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45EIh6os020652;
Fri, 14 Jun 2024 18:43:06 GMT
(envelope-from git)
Date: Fri, 14 Jun 2024 18:43:06 GMT
Message-Id: <202406141843.45EIh6os020652@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Subject: git: f70e21e70b1d - stable/13 - LinuxKPI: 802.11: rename
chanctx_conf for consistency
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-all@freebsd.org
Sender: owner-dev-commits-src-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: bz
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: f70e21e70b1d2698b4b22942930c5db2ae603b31
Auto-Submitted: auto-generated
The branch stable/13 has been updated by bz:
URL: https://cgit.FreeBSD.org/src/commit/?id=f70e21e70b1d2698b4b22942930c5db2ae603b31
commit f70e21e70b1d2698b4b22942930c5db2ae603b31
Author: Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2024-05-13 21:03:31 +0000
Commit: Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2024-06-14 14:55:16 +0000
LinuxKPI: 802.11: rename chanctx_conf for consistency
We used to call the struct ieee80211_chanctx_conf variable "conf"
in some places but that becomes confusing with bss_conf and other
"conf" bits. On the vif it is already called chanctx_conf thus also
rename it on the internal struct lkpi_chanctx and for our variables
in the implementation.
This should not have any external visibility.
No functional changes intended.
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D45185
(cherry picked from commit d1af434d99941d32a09c48fb3ef77ef83e203d29)
---
sys/compat/linuxkpi/common/src/linux_80211.c | 88 ++++++++++++++--------------
sys/compat/linuxkpi/common/src/linux_80211.h | 6 +-
2 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c
index 632645a116b2..870c3414f19e 100644
--- a/sys/compat/linuxkpi/common/src/linux_80211.c
+++ b/sys/compat/linuxkpi/common/src/linux_80211.c
@@ -1079,7 +1079,7 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int
{
struct linuxkpi_ieee80211_channel *chan;
struct lkpi_chanctx *lchanctx;
- struct ieee80211_chanctx_conf *conf;
+ struct ieee80211_chanctx_conf *chanctx_conf;
struct lkpi_hw *lhw;
struct ieee80211_hw *hw;
struct lkpi_vif *lvif;
@@ -1145,54 +1145,54 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int
/* Add chanctx (or if exists, change it). */
if (vif->chanctx_conf != NULL) {
- conf = vif->chanctx_conf;
- lchanctx = CHANCTX_CONF_TO_LCHANCTX(conf);
+ chanctx_conf = vif->chanctx_conf;
+ lchanctx = CHANCTX_CONF_TO_LCHANCTX(chanctx_conf);
IMPROVE("diff changes for changed, working on live copy, rcu");
} else {
/* Keep separate alloc as in Linux this is rcu managed? */
lchanctx = malloc(sizeof(*lchanctx) + hw->chanctx_data_size,
M_LKPI80211, M_WAITOK | M_ZERO);
- conf = &lchanctx->conf;
+ chanctx_conf = &lchanctx->chanctx_conf;
}
- conf->rx_chains_dynamic = 1;
- conf->rx_chains_static = 1;
- conf->radar_enabled =
+ chanctx_conf->rx_chains_dynamic = 1;
+ chanctx_conf->rx_chains_static = 1;
+ chanctx_conf->radar_enabled =
(chan->flags & IEEE80211_CHAN_RADAR) ? true : false;
- conf->def.chan = chan;
- conf->def.width = NL80211_CHAN_WIDTH_20_NOHT;
- conf->def.center_freq1 = chan->center_freq;
- conf->def.center_freq2 = 0;
+ chanctx_conf->def.chan = chan;
+ chanctx_conf->def.width = NL80211_CHAN_WIDTH_20_NOHT;
+ chanctx_conf->def.center_freq1 = chan->center_freq;
+ chanctx_conf->def.center_freq2 = 0;
IMPROVE("Check vht_cap from band not just chan?");
KASSERT(ni->ni_chan != NULL && ni->ni_chan != IEEE80211_CHAN_ANYC,
("%s:%d: ni %p ni_chan %p\n", __func__, __LINE__, ni, ni->ni_chan));
#ifdef LKPI_80211_HT
if (IEEE80211_IS_CHAN_HT(ni->ni_chan)) {
if (IEEE80211_IS_CHAN_HT40(ni->ni_chan)) {
- conf->def.width = NL80211_CHAN_WIDTH_40;
+ chanctx_conf->def.width = NL80211_CHAN_WIDTH_40;
} else
- conf->def.width = NL80211_CHAN_WIDTH_20;
+ chanctx_conf->def.width = NL80211_CHAN_WIDTH_20;
}
#endif
#ifdef LKPI_80211_VHT
if (IEEE80211_IS_CHAN_VHT(ni->ni_chan)) {
#ifdef __notyet__
if (IEEE80211_IS_CHAN_VHT80P80(ni->ni_chan)) {
- conf->def.width = NL80211_CHAN_WIDTH_80P80;
- conf->def.center_freq2 = 0; /* XXX */
+ chanctx_conf->def.width = NL80211_CHAN_WIDTH_80P80;
+ chanctx_conf->def.center_freq2 = 0; /* XXX */
} else
#endif
if (IEEE80211_IS_CHAN_VHT160(ni->ni_chan))
- conf->def.width = NL80211_CHAN_WIDTH_160;
+ chanctx_conf->def.width = NL80211_CHAN_WIDTH_160;
else if (IEEE80211_IS_CHAN_VHT80(ni->ni_chan))
- conf->def.width = NL80211_CHAN_WIDTH_80;
+ chanctx_conf->def.width = NL80211_CHAN_WIDTH_80;
}
#endif
/* Responder ... */
- conf->min_def.chan = chan;
- conf->min_def.width = NL80211_CHAN_WIDTH_20_NOHT;
- conf->min_def.center_freq1 = chan->center_freq;
- conf->min_def.center_freq2 = 0;
+ chanctx_conf->min_def.chan = chan;
+ chanctx_conf->min_def.width = NL80211_CHAN_WIDTH_20_NOHT;
+ chanctx_conf->min_def.center_freq1 = chan->center_freq;
+ chanctx_conf->min_def.center_freq2 = 0;
IMPROVE("currently 20_NOHT min_def only");
/* Set bss info (bss_info_changed). */
@@ -1218,14 +1218,14 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int
changed |= IEEE80211_CHANCTX_CHANGE_RADAR;
changed |= IEEE80211_CHANCTX_CHANGE_RX_CHAINS;
changed |= IEEE80211_CHANCTX_CHANGE_WIDTH;
- lkpi_80211_mo_change_chanctx(hw, conf, changed);
+ lkpi_80211_mo_change_chanctx(hw, chanctx_conf, changed);
} else {
- error = lkpi_80211_mo_add_chanctx(hw, conf);
+ error = lkpi_80211_mo_add_chanctx(hw, chanctx_conf);
if (error == 0 || error == EOPNOTSUPP) {
- vif->bss_conf.chandef.chan = conf->def.chan;
- vif->bss_conf.chandef.width = conf->def.width;
+ vif->bss_conf.chandef.chan = chanctx_conf->def.chan;
+ vif->bss_conf.chandef.width = chanctx_conf->def.width;
vif->bss_conf.chandef.center_freq1 =
- conf->def.center_freq1;
+ chanctx_conf->def.center_freq1;
#ifdef LKPI_80211_HT
if (vif->bss_conf.chandef.width == NL80211_CHAN_WIDTH_40) {
/* Note: it is 10 not 20. */
@@ -1236,26 +1236,26 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int
}
#endif
vif->bss_conf.chandef.center_freq2 =
- conf->def.center_freq2;
+ chanctx_conf->def.center_freq2;
} else {
ic_printf(vap->iv_ic, "%s:%d: mo_add_chanctx "
"failed: %d\n", __func__, __LINE__, error);
goto out;
}
- vif->bss_conf.chanctx_conf = conf;
+ vif->bss_conf.chanctx_conf = chanctx_conf;
/* Assign vif chanctx. */
if (error == 0)
error = lkpi_80211_mo_assign_vif_chanctx(hw, vif,
- &vif->bss_conf, conf);
+ &vif->bss_conf, chanctx_conf);
if (error == EOPNOTSUPP)
error = 0;
if (error != 0) {
ic_printf(vap->iv_ic, "%s:%d: mo_assign_vif_chanctx "
"failed: %d\n", __func__, __LINE__, error);
- lkpi_80211_mo_remove_chanctx(hw, conf);
- lchanctx = CHANCTX_CONF_TO_LCHANCTX(conf);
+ lkpi_80211_mo_remove_chanctx(hw, chanctx_conf);
+ lchanctx = CHANCTX_CONF_TO_LCHANCTX(chanctx_conf);
free(lchanctx, M_LKPI80211);
goto out;
}
@@ -1457,9 +1457,9 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int
/* Take the chan ctx down. */
if (vif->chanctx_conf != NULL) {
struct lkpi_chanctx *lchanctx;
- struct ieee80211_chanctx_conf *conf;
+ struct ieee80211_chanctx_conf *chanctx_conf;
- conf = vif->chanctx_conf;
+ chanctx_conf = vif->chanctx_conf;
/* Remove vif context. */
lkpi_80211_mo_unassign_vif_chanctx(hw, vif, &vif->bss_conf, &vif->chanctx_conf);
/* NB: vif->chanctx_conf is NULL now. */
@@ -1467,8 +1467,8 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int
lkpi_hw_conf_idle(hw, true);
/* Remove chan ctx. */
- lkpi_80211_mo_remove_chanctx(hw, conf);
- lchanctx = CHANCTX_CONF_TO_LCHANCTX(conf);
+ lkpi_80211_mo_remove_chanctx(hw, chanctx_conf);
+ lchanctx = CHANCTX_CONF_TO_LCHANCTX(chanctx_conf);
free(lchanctx, M_LKPI80211);
}
@@ -1795,9 +1795,9 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i
/* Take the chan ctx down. */
if (vif->chanctx_conf != NULL) {
struct lkpi_chanctx *lchanctx;
- struct ieee80211_chanctx_conf *conf;
+ struct ieee80211_chanctx_conf *chanctx_conf;
- conf = vif->chanctx_conf;
+ chanctx_conf = vif->chanctx_conf;
/* Remove vif context. */
lkpi_80211_mo_unassign_vif_chanctx(hw, vif, &vif->bss_conf, &vif->chanctx_conf);
/* NB: vif->chanctx_conf is NULL now. */
@@ -1805,8 +1805,8 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i
lkpi_hw_conf_idle(hw, true);
/* Remove chan ctx. */
- lkpi_80211_mo_remove_chanctx(hw, conf);
- lchanctx = CHANCTX_CONF_TO_LCHANCTX(conf);
+ lkpi_80211_mo_remove_chanctx(hw, chanctx_conf);
+ lchanctx = CHANCTX_CONF_TO_LCHANCTX(chanctx_conf);
free(lchanctx, M_LKPI80211);
}
@@ -2364,9 +2364,9 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int
/* Take the chan ctx down. */
if (vif->chanctx_conf != NULL) {
struct lkpi_chanctx *lchanctx;
- struct ieee80211_chanctx_conf *conf;
+ struct ieee80211_chanctx_conf *chanctx_conf;
- conf = vif->chanctx_conf;
+ chanctx_conf = vif->chanctx_conf;
/* Remove vif context. */
lkpi_80211_mo_unassign_vif_chanctx(hw, vif, &vif->bss_conf, &vif->chanctx_conf);
/* NB: vif->chanctx_conf is NULL now. */
@@ -2374,8 +2374,8 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int
lkpi_hw_conf_idle(hw, true);
/* Remove chan ctx. */
- lkpi_80211_mo_remove_chanctx(hw, conf);
- lchanctx = CHANCTX_CONF_TO_LCHANCTX(conf);
+ lkpi_80211_mo_remove_chanctx(hw, chanctx_conf);
+ lchanctx = CHANCTX_CONF_TO_LCHANCTX(chanctx_conf);
free(lchanctx, M_LKPI80211);
}
@@ -4771,7 +4771,7 @@ linuxkpi_ieee80211_iterate_chan_contexts(struct ieee80211_hw *hw,
if (!lchanctx->added_to_drv)
continue;
- iterfunc(hw, &lchanctx->conf, arg);
+ iterfunc(hw, &lchanctx->chanctx_conf, arg);
}
LKPI_80211_LHW_LVIF_UNLOCK(lhw);
}
diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h
index b0156a5ade3f..a48cf719c693 100644
--- a/sys/compat/linuxkpi/common/src/linux_80211.h
+++ b/sys/compat/linuxkpi/common/src/linux_80211.h
@@ -267,12 +267,12 @@ struct lkpi_hw { /* name it mac80211_sc? */
struct lkpi_chanctx {
bool added_to_drv; /* Managed by MO */
- struct ieee80211_chanctx_conf conf __aligned(CACHE_LINE_SIZE);
+ struct ieee80211_chanctx_conf chanctx_conf __aligned(CACHE_LINE_SIZE);
};
#define LCHANCTX_TO_CHANCTX_CONF(_lchanctx) \
- (&(_lchanctx)->conf)
+ (&(_lchanctx)->chanctx_conf)
#define CHANCTX_CONF_TO_LCHANCTX(_conf) \
- container_of(_conf, struct lkpi_chanctx, conf)
+ container_of(_conf, struct lkpi_chanctx, chanctx_conf)
struct lkpi_wiphy {
const struct cfg80211_ops *ops;