From nobody Mon Feb 24 20:27:15 2025 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 4Z1sjM3McDz5pq6N; Mon, 24 Feb 2025 20:27:19 +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 4Z1sjJ67pfz3p3y; Mon, 24 Feb 2025 20:27:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740428836; 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=ITUeeOy6fb//Yq65rbEVH32wgW/kHIanIbOoauVr6rY=; b=XUCMq0d+P+ivc4J9RKXb74ZQ/pThzWor85azZyiCpo4y4gUXZCP9avHjuFwGbOGdHw++Ov hdcuuLSEWbgHFmIjUIlx7O4oWfaGx3q8jSesAAWeWiDO8EvA1GZTDh3pgc6ucE35lKPLwW p/82v27zhrHX/n1XEXqjRhKvfDBYjIdnsuK754GoEfRWW1TWiyzdupg+j0xgOHvqyB5CsY ldGXcb+sd5G6+/UMdCOCyTbYCUuHjRGX4eF0zpyBNH28pahsa907z/07LjVcx1bEAPTeeB 2qojo7qQzRvAefRX/B3gExtv9pWB5VE9P3UR1b2L4Tqy362vhjx4rU+El8w+gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740428836; a=rsa-sha256; cv=none; b=ZjTDXEdL8bsuXrZLyEkOGHCExXx1H2xZHeheNuMNsu2mfMicD19FX57lFXDRZKLlyucywe LRGZN2uhZCCcgm9hisCi2X+uxCwGydZs+1TdiyjwhOnDjcx3XqJI4IAeJKVMecFO6nOv93 MSfD6vffmJZYrwD7ZSrDnANcCSDtZeadBWRLFOmKxjCaPIxP9FZ01HIPOI+LNIYGB24Qvh bqIZfIcA2i+32qOKUv7UAJ+xD+lywnTiz4jLWF08yUlrOmTzZksYw9zOzdeeDI40iLHzGU PgJrsoHox+Ro5/IRQN2E0ArQVayCJv6fkVnx2JwP1in/3AkWqOtCOXbdzU3bXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740428836; 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=ITUeeOy6fb//Yq65rbEVH32wgW/kHIanIbOoauVr6rY=; b=fepeAoBvsJi2MqGfX+G0Ti0fsRrFBTYI36/kKJKAccxrrs0XqDAvaCt6yUYJeTg2kZo/4z pqPQBaktnZ2sHv3ID7vAHlRCGcLVsqpURfwQfwbM4IyKKEgZhULOhME9Fjd/sGe7xfhyoJ X4R/qaCj86iOKpAxh1L8lO1om9FtSeoJSwQ4eaaK98wtHOr5a7zz3mu8sknRT1GhCS1D0/ GAlUVv7NPkErbRHtvN+162HCyBq+pHp0HCd3u3GnhqZmkboTh+R8KuNBt4yT98lAp1Da7v +zZFKNeHXmbF5mYYqoU2+34u9e+1Ji406qxaG/r7pLBsPGA+oksX/N0W0RZtPA== 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 4Z1sjH5RZMzvrR; Mon, 24 Feb 2025 20:27:15 +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 51OKRFxe027420; Mon, 24 Feb 2025 20:27:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51OKRFei027417; Mon, 24 Feb 2025 20:27:15 GMT (envelope-from git) Date: Mon, 24 Feb 2025 20:27:15 GMT Message-Id: <202502242027.51OKRFei027417@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: 00fc02712d23 - stable/14 - LinuxKPI; 802.11: start implementing cfg80211_calculate_bitrate() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 00fc02712d23663b993f887aa41081fff9760163 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=00fc02712d23663b993f887aa41081fff9760163 commit 00fc02712d23663b993f887aa41081fff9760163 Author: Bjoern A. Zeeb AuthorDate: 2024-12-28 10:10:56 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-24 20:26:49 +0000 LinuxKPI; 802.11: start implementing cfg80211_calculate_bitrate() For now we only return the legacy rate and have two TODOs for HT and VHT which still need to be implemented as needed. Sponsored by: The FreeBSD Foundation (cherry picked from commit a7c19b8a99a604e8940c7475220df5de7e295ffa) --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 6 ++--- sys/compat/linuxkpi/common/src/linux_80211.c | 30 +++++++++++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index bcbf629abb2f..cf1e05dde7ea 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -1304,6 +1304,7 @@ void linuxkpi_wiphy_delayed_work_cancel(struct wiphy *, int linuxkpi_regulatory_set_wiphy_regd_sync(struct wiphy *wiphy, struct linuxkpi_ieee80211_regdomain *regd); +uint32_t linuxkpi_cfg80211_calculate_bitrate(struct rate_info *); uint32_t linuxkpi_ieee80211_channel_to_frequency(uint32_t, enum nl80211_band); uint32_t linuxkpi_ieee80211_frequency_to_channel(uint32_t, uint32_t); struct linuxkpi_ieee80211_channel * @@ -1574,11 +1575,10 @@ cfg80211_find_vendor_ie(unsigned int oui, int oui_type, return (__DECONST(uint8_t *, elem)); } -static __inline uint32_t +static inline uint32_t cfg80211_calculate_bitrate(struct rate_info *rate) { - TODO(); - return (-1); + return (linuxkpi_cfg80211_calculate_bitrate(rate)); } static __inline uint32_t diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 0cffa36d96cb..7bb051a67ade 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -5891,6 +5891,36 @@ linuxkpi_wiphy_free(struct wiphy *wiphy) kfree(lwiphy); } +static uint32_t +lkpi_cfg80211_calculate_bitrate_ht(struct rate_info *rate) +{ + TODO("cfg80211_calculate_bitrate_ht"); + return (rate->legacy); +} + +static uint32_t +lkpi_cfg80211_calculate_bitrate_vht(struct rate_info *rate) +{ + TODO("cfg80211_calculate_bitrate_vht"); + return (rate->legacy); +} + +uint32_t +linuxkpi_cfg80211_calculate_bitrate(struct rate_info *rate) +{ + + /* Beware: order! */ + if (rate->flags & RATE_INFO_FLAGS_MCS) + return (lkpi_cfg80211_calculate_bitrate_ht(rate)); + + if (rate->flags & RATE_INFO_FLAGS_VHT_MCS) + return (lkpi_cfg80211_calculate_bitrate_vht(rate)); + + IMPROVE("HE/EHT/..."); + + return (rate->legacy); +} + uint32_t linuxkpi_ieee80211_channel_to_frequency(uint32_t channel, enum nl80211_band band)