From nobody Mon Feb 10 14:52:47 2025 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 4Ys6xs3p1dz5mGdc; Mon, 10 Feb 2025 14:52:49 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xq3HSrz4LYF; Mon, 10 Feb 2025 14:52:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199167; 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=RWOz1YTXr2Ij7w0lhcRBqTqgnz692/mRPgVe0pwz4wU=; b=IJBT+0xC100nMyvd6YvmoiEzJTSylMwtoCJQSOdWW/TSkNkE7SQhQDzjOjNsgOVaIRXu3Y OR943frr362/pU/6WmQ114tH7u+CZmU9pIO5Rhu155OcMjNzn5u6a76ReaKhBoOtnaPt/Z kawqWmSFJDSYmUWusg9SIKYhspRW36h3HAucGNd6E0/gLjLd+85ftNOl6vriTx5hW71Agt P7YkvWHjYilOyXjJTJZNPRiG2+SxHq3AO7d1ftTw9F9cnSvuvON6E3iQ0nT6pLEK3Cf1pi ApOv2FTDoQSdwNGjN9iSJQcO74sHAgTO5CuGGQVsjJ05GZ3Ttj7mfUjdrzWM0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199167; 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=RWOz1YTXr2Ij7w0lhcRBqTqgnz692/mRPgVe0pwz4wU=; b=PvonAjZSuyFup2+jcOT1jkKRq3roampyGx10YjLpk3Anq9YgkfxwMWgppDwn4H82S2BPa+ +KYhRR5XDflBsqDa+mh638a9Xx6kTLxsY0rGvPpGZ3Up1M8jYXsjroHC+7snfgMe59yl/d HkhU/AJ7DqamauIQANoOdYWlPjtqYsBGbwqjr0SKlFlzmxEF/ew0GxqOMSbKGi1BCJ7fa0 Bo4aGTu5+i4vLTkpPTPZ0PWYeOFV6SiFa/zx/ZQt7lXkniU2hmi162DW+DRtDKuqJb6gzf kKbpDqcqlLDJ0fAdo2jNN0WAHVVybQlmSD4I9MV6o/o+CYzNburo5RSVnxdbKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199167; a=rsa-sha256; cv=none; b=IvxRKGcJG0KKXzk4fVwNwJIg/FNLvSgFpegfPBL3lj1Oi6E591TN+UjK+HiVRdlVlCffgH 03/mDzXFHOHlsoH0i7RiazQJozcaHEe0qGQwBPhkj8QOwV1EhfuiCa3DsMkrG18xclRIn5 Mxr05C0nZQAzOlMZw1ax9TOXPYEy2+OYAykIGzHiUgqh8mbS64pe9M7cV00jU9s9bXiOfl pYNmUmDVQPxCav6yhr0n0n1AuDdbxKzhGzEOaL8DwzMnjMsYQq8WxznRdNkcLdhlfufWiO Oqt/K/IgGyZRMd3JLzIpMkguUkXKTEsXFSbvk+gzcCvFZ7Tl25QZIWwuYsv2Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ys6xq2mywzXWH; Mon, 10 Feb 2025 14:52:47 +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 51AEqlVi028120; Mon, 10 Feb 2025 14:52:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqlZ2028117; Mon, 10 Feb 2025 14:52:47 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:47 GMT Message-Id: <202502101452.51AEqlZ2028117@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: 950dc789cc63 - stable/14 - LinuxKPI: 802.11: make HT compile again 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 950dc789cc63e65882f65f5601911085e7f07e6c Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=950dc789cc63e65882f65f5601911085e7f07e6c commit 950dc789cc63e65882f65f5601911085e7f07e6c Author: Bjoern A. Zeeb AuthorDate: 2024-12-01 19:53:06 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:09 +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 (cherry picked from commit 943a19c666d67424cdde6cbcd096f28359b2d314) --- 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 5aa86ab7ebec..3c9b9dc42fcc 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1275,12 +1275,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 =