From nobody Wed Jan 18 16:24:54 2023 X-Original-To: dev-commits-src-all@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 4Nxrh633T3z2yJM1; Wed, 18 Jan 2023 16:24:54 +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 4Nxrh62Bdyz3FDF; Wed, 18 Jan 2023 16:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674059094; 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=ZE9dH6vMfl3tFp9N2hc+EEheh4AhlERPP50kwSzLz5s=; b=T4P2M+gXeZrmHxemyAeLEsMeUCh25PbWpggog/AD8WS7LZh00zu97sR/CVl429qxVkClsY g1dq1CrSnR+Gn+2yZlyH0lCLWcqLv4zvzIjsNx83muoz5xp9t4pBP7fb45kOJPRoXKb89r un8XpAz4T3dincCQtEmmPWJabcrV9MTUPqdZwMsr6jZSwXbdS60hTGbX834h1kRJ2hdQCv dn+d1yxSTp84aDD/ZlNdtCZAg0ztZRGQhAdzwQHq1rXQ29oLKL4uQF92LuC3i83NaJvRxY Y0rSh8+39FUemYtIseFl8zj9Nxt0/+jtkKpZiQyeyKMO7CXIfzlqGmKEpN9OfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674059094; 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=ZE9dH6vMfl3tFp9N2hc+EEheh4AhlERPP50kwSzLz5s=; b=fNFocOkFdpHyWT+IUJJQFYowm1OSGIOGS/MDUWc2kmQQL1E8Vaq/mADVVPtUtcy+Iu4w9h +FhT7AXEh1Iydq+lZfR25bm5h/GeuQpU46rgX87gKmuw8S9nLLfYYYJCeCK8KbFei9pG0c kgZZTApjyI1USLWqo1QuoFct5Sysg+v4Ej7TBv/HsmJ57YdVLRCH1KYGatleesr7mmzFN8 Uw3q2Osd5J+Il9D4eAVyRmsXJeTgiCu2lZlqhao8eDcWvI1Ugc37zftU5/4zCbK+yXvWB6 GPEZIboX+3QUJXy9RxUhu0d0uEcV4t1r7uryyNNvfNTTuJfXc8Ta/GL3qhSruQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674059094; a=rsa-sha256; cv=none; b=XLFvgg3RCwybKhN9mHhYW5VN6kkGGLlSZbDOBekAXd3q/z+iBzwso1l4/nZETMyWYePs41 6W9mw13rqTnDRGgXoAl9SOYcudoFPf4RVpgfRf6OCY6+NTYXbv1aXgIgJ7fsOda5I7DyPd YRH7yc816XkvkDtJuJYahBXEVBm60D+Sp60XtSiwuT29qeuNKu2OOi7WKmGv7Qizi2nLYm HkezUierujYqwKOicMUDm7JI0Xskqc+/IbTc7nPu3XOZhJHrmhwOcjFtGNvb1eEisy28CQ GFWoxaNRV9vaMfmHaX7prgpWNUZSqsvTPTWuI6A5whxZ2GISlCKTQq/FKWOi1A== 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 4Nxrh61BYtzJB3; Wed, 18 Jan 2023 16:24:54 +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 30IGOsmF038036; Wed, 18 Jan 2023 16:24:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30IGOsWg038035; Wed, 18 Jan 2023 16:24:54 GMT (envelope-from git) Date: Wed, 18 Jan 2023 16:24:54 GMT Message-Id: <202301181624.30IGOsWg038035@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: 44b254d9d329 - stable/13 - LinuxKPI: 802.11: implement cfg80211_get_ies_channel_number() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 44b254d9d32939ef223cb0e3df1ea085a3a5efd2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=44b254d9d32939ef223cb0e3df1ea085a3a5efd2 commit 44b254d9d32939ef223cb0e3df1ea085a3a5efd2 Author: Bjoern A. Zeeb AuthorDate: 2022-12-31 01:59:20 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-01-18 13:25:46 +0000 LinuxKPI: 802.11: implement cfg80211_get_ies_channel_number() Using the previous changes implement cfg80211_get_ies_channel_number() either based on DSPARMS (or for the future HTINFO). Sponsored by: The FreeBSD Foundation (cherry picked from commit 13d87d92e401523f8d8e817720d40dc31cdfa444) --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 28 +++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index e6f1bd88309d..ee6697bb4d4a 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -1677,12 +1677,36 @@ cfg80211_channel_is_psc(struct linuxkpi_ieee80211_channel *channel) return (false); } -static __inline int +static inline int cfg80211_get_ies_channel_number(const uint8_t *ie, size_t len, enum nl80211_band band, enum cfg80211_bss_frame_type ftype) { + const struct element *elem; - TODO(); + switch (band) { + case NL80211_BAND_6GHZ: + TODO(); + break; + case NL80211_BAND_5GHZ: + case NL80211_BAND_2GHZ: + /* DSPARAMS has the channel number. */ + elem = cfg80211_find_elem(IEEE80211_ELEMID_DSPARMS, ie, len); + if (elem != NULL && elem->datalen == 1) + return (elem->data[0]); + /* HTINFO has the primary center channel. */ + elem = cfg80211_find_elem(IEEE80211_ELEMID_HTINFO, ie, len); + if (elem != NULL && + elem->datalen >= (sizeof(struct ieee80211_ie_htinfo) - 2)) { + const struct ieee80211_ie_htinfo *htinfo; + htinfo = (const struct ieee80211_ie_htinfo *)elem; + return (htinfo->hi_ctrlchannel); + } + /* What else? */ + break; + default: + IMPROVE("Unsupported"); + break; + } return (-1); }