From nobody Mon Dec 02 01:56:31 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 4Y1n2R6FtJz5fLrk; Mon, 02 Dec 2024 01:56:31 +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 4Y1n2R5kbmz4kg7; Mon, 2 Dec 2024 01:56:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733104591; 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=INesOiZE9YhZx4kzRm57x7pN1USHevHdz+faS5IOuuQ=; b=v7C43rlFEBJDLfj+yiAGTIybVux7t6oB8by9EEOvjvcaoXjre+QFxzn2JBGIbTOWC2Gaq3 G/NxXSpL+Q8WSEQ0thhjFIpYPv38Z3IoD8zia+vn+5tT0h2TiWLpme0MNokwUcplkv047k DOOEj0cko8v2IaPRTbR+J6UI52VzhYbvaN8bXfxVcTfylQwZ//AOrqxdL6Plas5Iv/svhO rxY0NDqU61WoCGRtxdl/a6uix/TpbFsGmLtzVOFLW2nPMhYCYPuRT9SgvxnvjplRyVqVyT Mholwg17xADiOnCH9xWG6R0+I+IjIeRc6WR5Ug9S3JbPEfIQip5kCsndZDW6uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733104591; 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=INesOiZE9YhZx4kzRm57x7pN1USHevHdz+faS5IOuuQ=; b=PRSnaVQorImr5fwd0ZLJpDW/jNmbDS0ZI1wAXCRoOKi7k0StuaWydhbquZkxcSompNUbAx 7934dy5oVGz4cV2PY1QEGNNxPlZfOrjhmsML0UP55ERwm2TMYuLZAGKkZgpRSyRn/i9vhK RXpISbFd9oA6cxzfO7qUXYkTD8ow64iwCMkiRUuR0qcL5Z3r62ZzvVY3RY54KDahQBAG1t Hn58+uQklR0ldhRWkc8+cP6NanD69webM1hWi8V3IOd/XVlEXRat/ZzWJiG+72VQZpfz59 62mYoJlfqGt/kI3Uki4sA1k1t6ZxYfpJP6eoaL3u7EeVRVuaRPfAYGfKpUhi0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733104591; a=rsa-sha256; cv=none; b=JobU+nLvI1UL1OmuCan0MZ12hNLrWfQuCRmN0/P2iKod3gif/lN8BZlfY/L+JCFGCtgnaT 2k8cqdiBAyRKqtgQ/2oOwg00smGASXY8nd0p72WI34thj6ZExQWENKjEExS7qpItsgus2B cPpgYkAWdfh1aJ2od5MmJwRY+8y2Fyg5s4ryShwOcjYtUoqgNSwWUJjdjtgeXsIgRLTMpO 5H2er60kCyj0dstj8Zui0Yjs+6607W4DLJTMBtqdQ5hck1uhG8GzpCa3CFaL9bbdyxDm9C y0B+JHC37jpSaFR4h+/gdIGNc0gEcFMNHQuzYZfrfqM5xwqOv9Dkn6jKRJP2ew== 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 4Y1n2R4vBfzJGy; Mon, 2 Dec 2024 01:56:31 +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 4B21uV0U045793; Mon, 2 Dec 2024 01:56:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B21uVn1045790; Mon, 2 Dec 2024 01:56:31 GMT (envelope-from git) Date: Mon, 2 Dec 2024 01:56:31 GMT Message-Id: <202412020156.4B21uVn1045790@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: a0e45db6f6eb - main - contrib/wpa: pass IFM_IEEE80211_VHT5G if vht_enabled on the channel 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: a0e45db6f6eb6660e78921bbd5307fa7fc13d0a9 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a0e45db6f6eb6660e78921bbd5307fa7fc13d0a9 commit a0e45db6f6eb6660e78921bbd5307fa7fc13d0a9 Author: Bjoern A. Zeeb AuthorDate: 2022-11-09 16:41:56 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-12-02 01:54:05 +0000 contrib/wpa: pass IFM_IEEE80211_VHT5G if vht_enabled on the channel Set media mode correctly to IFM_IEEE80211_VHT5G if vht_enabled is set on the channel. Otherwise we'll end up setting 11NA. Not a problem on first sight given net80211 does the upgrade to VHT for us. But we would not set iv_des_mode ("desired mode") on the vap. Setting this will put a contraint on/help scanning for our desired (VHT) channels to my understanding of the code. Sponsored by: The FreeBSD Foundation MFC after: 6 weeks Reviewed by: cy, adrian Differential Revision: https://reviews.freebsd.org/D35978 --- contrib/wpa/src/drivers/driver_bsd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/wpa/src/drivers/driver_bsd.c b/contrib/wpa/src/drivers/driver_bsd.c index 712446a62fe4..fc9a44743d7d 100644 --- a/contrib/wpa/src/drivers/driver_bsd.c +++ b/contrib/wpa/src/drivers/driver_bsd.c @@ -631,6 +631,7 @@ bsd_set_freq(void *priv, struct hostapd_freq_params *freq) mode = IFM_IEEE80211_11B; } else { mode = + freq->vht_enabled ? IFM_IEEE80211_VHT5G : freq->ht_enabled ? IFM_IEEE80211_11NA : IFM_IEEE80211_11A; }