From nobody Sun Dec 01 19:57:14 2024 X-Original-To: dev-commits-src-main@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 4Y1d3t6DdBz5g6Nj; Sun, 01 Dec 2024 19:57:14 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y1d3t5h0Bz4DvV; Sun, 1 Dec 2024 19:57:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733083034; 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=8VceQeV12dIiTqGeFt9Z1WIksuxuFXhXziTSCU271o0=; b=UJAwAYZJXN1eXL+Ypv3QKqmt1ikaL6pyBKTQpH65B5P0NgWQRKoBYL1DaUB58JqAEBD3M+ 1E1EbtdQnUfZAFLfjHMV3YzETAb7exuAJ9WrAzZK0Q2291Z6ngZWmjhrCvd/NhqVzczbHc cmiwtDsB2JHDffdZZht9ZT4WsQwp7qU2/lPWERwXrG0CJoEWq9xGRlU8Ij4GCghO18KV0y 5TRYYVPzockODoyMXwvwgQHqbtlk8Ea+PLT+Cp8WZsFWaWLQILdNJjlySpmWY9wihMt4pH 2dZujs7Gm+kn4oaHoQIxxjCbIEB78WrqgaGCdtQUMrzlxKdg0lQl7LezzwbYtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733083034; 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=8VceQeV12dIiTqGeFt9Z1WIksuxuFXhXziTSCU271o0=; b=Tjyo3D57mELSLnk6+nMiWbaPawWteRa9e9C0zm4NAnoGH/RMZW252VPcLNPYYC+CCm9zC9 Hzwqt7IJ6kT9VJdADeq/uZISszXgr37pgetDK1pIRKIl2sLTv3PKK5G1wBECtu/0z8B9nT mY/Fljz7tYUsGCsy/Sxv6CcPKI2m3QJJQPMBA8T2lOAnuKp2y2/xafIneook9eqFBMT3MJ OsASIWByx4JAJJazhTEqo7z6VWCEzaVXEj4H3TEwOl2eEtV37W1KtkLTCPFls8aLXy5WmF 3xI02RbCMOMV9Gtqq5l+mnHO9uPBgSlsR9I+gA17AeQAPouMBHPQcQzb8ir5aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733083034; a=rsa-sha256; cv=none; b=yy2ct7IgLonhPpC8UeYsBkr13Ucq6uF1Ei73Km4tMyLl50l5f7/gS+esnlHxdM/IcJPUUv fAO/o0NpvcQ3qFF/NPawowUvh/ckIXXQA0wgjvQagCmUqdRHN+cGeqczgooU6kbiE4ekRh KlbdbW+MHMlxdjaovQc91tjekzRiwExlhsQ1Gv2GHocYrssCdxEoYPEig27rv93lf919d0 AeYo6d2qI+pcMhtMTr9ALa1Gc2hj5V3PwdH6lZTJ8P3C2Ww1rS13JNYj+l1BtFwiLs883z Q8dLTv7I0dWVxdcDuXdQ2ebAb5oeLD3lPyw2avYQoimrWCZJEt6kg7W47FWxhw== 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 4Y1d3t5Gfdz16fw; Sun, 1 Dec 2024 19:57:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B1JvE1q077816; Sun, 1 Dec 2024 19:57:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B1JvEFQ077813; Sun, 1 Dec 2024 19:57:14 GMT (envelope-from git) Date: Sun, 1 Dec 2024 19:57:14 GMT Message-Id: <202412011957.4B1JvEFQ077813@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 943a19c666d6 - main - LinuxKPI: 802.11: make HT compile again List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 943a19c666d67424cdde6cbcd096f28359b2d314 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=943a19c666d67424cdde6cbcd096f28359b2d314 commit 943a19c666d67424cdde6cbcd096f28359b2d314 Author: Bjoern A. Zeeb AuthorDate: 2024-12-01 19:53:06 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-12-01 19:56:10 +0000 LinuxKPI: 802.11: make HT compile again Bring in changes missed during the last driver updates to make HT compile when enabled. Sponsored by: The FreeBSD Foundation Fixes: 7b43f4d064195 MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 543a11b1f729..44c96909a002 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1272,12 +1272,12 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int vif->bss_conf.chanreq.oper.center_freq1 = chanctx_conf->def.center_freq1; #ifdef LKPI_80211_HT - if (vif->bss_conf.chandef.width == NL80211_CHAN_WIDTH_40) { + if (vif->bss_conf.chanreq.oper.width == NL80211_CHAN_WIDTH_40) { /* Note: it is 10 not 20. */ if (IEEE80211_IS_CHAN_HT40U(ni->ni_chan)) - vif->bss_conf.chandef.center_freq1 += 10; + vif->bss_conf.chanreq.oper.center_freq1 += 10; else if (IEEE80211_IS_CHAN_HT40D(ni->ni_chan)) - vif->bss_conf.chandef.center_freq1 -= 10; + vif->bss_conf.chanreq.oper.center_freq1 -= 10; } #endif vif->bss_conf.chanreq.oper.center_freq2 =