From nobody Thu Feb 23 19:34:35 2023 X-Original-To: dev-commits-src-branches@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 4PN3BM4PVMz3sf80; Thu, 23 Feb 2023 19:34:35 +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 4PN3BM2xRpz45H9; Thu, 23 Feb 2023 19:34:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677180875; 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=ZjqncX0nr62SdF59DSIoz8P6oaiP6NReMcQrJV8h4tY=; b=ldTNAaWwBQiA8FITnY8sa4JSwxy8h8gqziZVB2zVyP+lvIRaU7Kvz7i0eAOlliVQbp3nzP jBKazLoND2Xn2U+EN5JmT5hKt9CHIscwZuqQKRvDcYvbt0gXvs0sNHywCQymRIe0ypu3To ZfG8ABmKcZHoJL1ruvYyOgfLXiPxUnUDvFYgWGUoW9Gf38xHsEWyXj6Nqasonud/Kha5Ty sU19PtvbW52mO1mUqcuSfBDuVOV5QOVP7h+/J/0MUIslT7wsKgCCr/xk4zv7BmhipIIHrm dV5aS1WYKByVz3Ps0FYjjur97x2AI7zpVtvv0zPjpEA+Z69Fly6ujh7ZFBLMHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677180875; 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=ZjqncX0nr62SdF59DSIoz8P6oaiP6NReMcQrJV8h4tY=; b=jugW8WJnzdmKHuS4OCBETT6XpzReBInHq0QgYquYBQ3yx8WaE75+MQMJa8jrBet4HJqOjy OokxmE2ZIDYvgvIfku0wrSFfZaYHl5/YPcCCSb5GvsCOOEr4ngDLAZngjU3KpDjaiGQNtz N1mtyUdUeBmiuIDZcpUopUtq8FL2FVgj1HQGj47QKaAC5jAkNiAk7LAywENL3GdM7mPTxt sRmHJAiLVkVrUX5jzAi2a84FE5b+lIDYeTQIU+LgJA+FAgwAA1o0FxJVywcZOiUIiOs81Z wmCwg5r2ikQJ/dnEF8cHR6F0ZBT4OQ2NlX+ERnMPDOpaOqPIcMgjbTpSCFkN9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677180875; a=rsa-sha256; cv=none; b=epeoyp2iSSosUJ2GT7BHy7uBsUzG3tzvz2B640u+oPkcKvSnQdehD6ee39GEexaCWTD8Jv o2uUhMq/XX+WYD+rT+lfj4qmIx4hqbzb5RTcez3ZZBtKQ0nO4lqFLn/2Rb7iiBLrVCmmK/ 8S4fWzsPCyUx6gl6b3dgB7e6jJ0frT8hYezd5fdMYdNv/joGfYJPqk4wDdXlD+/lhyNmIq J5MkNcnyogeoD4IKQVh7HRFltxmlwsj4LsExUWuUc8WFH15RcXDPoycWNkVi5Xa5GT7HRe wKrXGIIj+wpZ5FJAIGrZarMGgGi0/0Wq+mU0J6a13JK1ILP1jG7UH0XeSsGzxg== 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 4PN3BM22gCzts8; Thu, 23 Feb 2023 19:34:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31NJYZn3020360; Thu, 23 Feb 2023 19:34:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31NJYZj9020359; Thu, 23 Feb 2023 19:34:35 GMT (envelope-from git) Date: Thu, 23 Feb 2023 19:34:35 GMT Message-Id: <202302231934.31NJYZj9020359@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 377fdea48222 - releng/13.2 - LinuxKPI: 802.11: enhance lkpi_scan_ies_add() for HT and VHT List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 377fdea48222d2422d18c93d4d2dada1f553e2bb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=377fdea48222d2422d18c93d4d2dada1f553e2bb commit 377fdea48222d2422d18c93d4d2dada1f553e2bb Author: Bjoern A. Zeeb AuthorDate: 2023-01-31 23:00:28 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-02-23 19:32:48 +0000 LinuxKPI: 802.11: enhance lkpi_scan_ies_add() for HT and VHT Add code (currently disabled by #ifdef) for HT and VHT to lkpi_scan_ies_add(). Switch to a local variable for ic given the new code also needs the value. Sponsored by: The FreeBSD Foundation Approved by: re (cperciva) (cherry picked from commit 3dd980267f4e53df259eb6d322e7332a8bc5bb0a) (cherry picked from commit 28fbc0caa49b0fb119cc34a704d5437d63f479a3) --- sys/compat/linuxkpi/common/src/linux_80211.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 57dd174b62a1..b2969aeb5db2 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2478,11 +2478,13 @@ lkpi_scan_ies_add(uint8_t *p, struct ieee80211_scan_ies *scan_ies, { struct ieee80211_supported_band *supband; struct linuxkpi_ieee80211_channel *channels; + struct ieee80211com *ic; const struct ieee80211_channel *chan; const struct ieee80211_rateset *rs; uint8_t *pb; int band, i; + ic = vap->iv_ic; for (band = 0; band < NUM_NL80211_BANDS; band++) { if ((band_mask & (1 << band)) == 0) continue; @@ -2503,7 +2505,7 @@ lkpi_scan_ies_add(uint8_t *p, struct ieee80211_scan_ies *scan_ies, if (channels[i].flags & IEEE80211_CHAN_DISABLED) continue; - chan = ieee80211_find_channel(vap->iv_ic, + chan = ieee80211_find_channel(ic, channels[i].center_freq, 0); if (chan != NULL) break; @@ -2514,10 +2516,31 @@ lkpi_scan_ies_add(uint8_t *p, struct ieee80211_scan_ies *scan_ies, continue; pb = p; - rs = ieee80211_get_suprates(vap->iv_ic, chan); /* calls chan2mode */ + rs = ieee80211_get_suprates(ic, chan); /* calls chan2mode */ p = ieee80211_add_rates(p, rs); p = ieee80211_add_xrates(p, rs); +#if defined(LKPI_80211_HT) + if ((vap->iv_flags_ht & IEEE80211_FHT_HT) != 0) { + struct ieee80211_channel *c; + + c = ieee80211_ht_adjust_channel(ic, ic->ic_curchan, + vap->iv_flags_ht); + p = ieee80211_add_htcap_ch(p, vap, c); + } +#endif +#if defined(LKPI_80211_VHT) + if ((vap->iv_vht_flags & IEEE80211_FVHT_VHT) != 0) { + struct ieee80211_channel *c; + + c = ieee80211_ht_adjust_channel(ic, ic->ic_curchan, + vap->iv_flags_ht); + c = ieee80211_vht_adjust_channel(ic, c, + vap->iv_vht_flags); + p = ieee80211_add_vhtcap_ch(p, vap, c); + } +#endif + scan_ies->ies[band] = pb; scan_ies->len[band] = p - pb; }