From nobody Fri Feb 17 23:44:57 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 4PJT220NGgz3rxbw; Fri, 17 Feb 2023 23:44:58 +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 4PJT2169XBz3HCx; Fri, 17 Feb 2023 23:44:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676677497; 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=gidOHjAj9pLJIy+i9PGUNPE0DqVmphGbcmiyQhG0P0E=; b=nZh5KZ6eMkYQHDjJdzJ/wjqh2naWCwdyw9AussOpQOUT/q6b0WIVyluZ+eFpGdSS6CQLps nk6psr7evYUSunopGGslTbTd0OpD+4uP1a1XMb1GNVDKnsk8KcojOAK90wGthu1MrFMfa+ 3yFjIAvA52IWyhy6OpdS3WvZtnaDMlDw3aEsI3+Uzr1bYcO+AcpseqD14SZ7hcMnQgBhPl yJMLBLlZikr5ZBJ/CbUbq6CXT5Ahe/x1YgLH2goPThOWBkhDOzGj6wghROFDHnDzjalaT4 9MhrYBggbO/BBEmyfuXeYUrCPu5PN9LgVZjWfIn380WWZV57YQgwRm9wEMaILQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676677497; 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=gidOHjAj9pLJIy+i9PGUNPE0DqVmphGbcmiyQhG0P0E=; b=e6SaxLn5IvYWIImv1iuUptMmFe0V5HDEO6jAQ3GSPl4XPmT9h4atY6+UaEZZMOT1Z0LBeB kh+ktnRVJ1oHSskFk+LiaKhW/29Jh4XRj7/UQ/ALn+pArgUhSvjJTkFDKzs/cSpzDrhMwv PcY9JObootWJbPMTkVO3SAoG6V22RlrlUqD+Cuux+nNWfahHh1utCNkGJsETkf0hwHHMBk kwM5kTmIfbm5RpqMfi9+jkmjAD1RB8g7PkZW3lZk0pL6ehlsfufe5JY2d447YEZZ7I0nvI bXbg2EkJm+Oer1lSknYsaPbZfEI7DRMPsCxZQlWwQ5bD7ycGKNgsnTlBTKnwvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676677497; a=rsa-sha256; cv=none; b=IrXjJ/QBug0Lc334MN/+noY+WcBxRFZT6kBGFQRRyuEdqqW0ILuUfJbs4dR79FrWx/hsFx DI+9QfDQoSEkkANltl2eFVlPM8Gs7jv6Qu8R15ImjloMH2ALfVEKE17/pMuSdx5yNynO20 aaLQDUGlcPJYVsqf8XDjsrRpkWYZT4Q4lk2a99PMoCzQfbwPkR2D/Hl4NWJd88fteEmDW8 VebVygKayDoAKykj7IepuTzLUBHpbq8QKZYBL5m0tfnGKl9NFrsPvdfSJGUa58aFhG5c+C d4P791rDyIN00u2fQv4hz+zZgy9SNtmY5OkzJte+O4O2bg4UZc3pMrdcqiSYcQ== 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 4PJT215GHNz11Wv; Fri, 17 Feb 2023 23:44:57 +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 31HNiviK025247; Fri, 17 Feb 2023 23:44:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31HNiv5i025246; Fri, 17 Feb 2023 23:44:57 GMT (envelope-from git) Date: Fri, 17 Feb 2023 23:44:57 GMT Message-Id: <202302172344.31HNiv5i025246@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: 28fbc0caa49b - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 28fbc0caa49b0fb119cc34a704d5437d63f479a3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=28fbc0caa49b0fb119cc34a704d5437d63f479a3 commit 28fbc0caa49b0fb119cc34a704d5437d63f479a3 Author: Bjoern A. Zeeb AuthorDate: 2023-01-31 23:00:28 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-02-17 23:42:16 +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 MFC after: 3 days (cherry picked from commit 3dd980267f4e53df259eb6d322e7332a8bc5bb0a) --- 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; }