From nobody Sat Jun 10 23:09:01 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 4QdttQ1Fqgz4d6YW; Sat, 10 Jun 2023 23:09:02 +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 4QdttQ0FyQz3NpL; Sat, 10 Jun 2023 23:09:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686438542; 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=jMdrbud1ZFikulSUR8zbqwqzZKNRkSMfuYmLPAOM/NI=; b=YHFUuzvBFW6lG2aWNR6ZrXCoVBsoKhxDoC9904TCPdG131Jm3jDk4YV69EzlsoqM2grulO ieVMRmihJcJpVNyL+iYxgRRhJMQDKUIJKNz6es/jtYWaRwhQ+7wB24vSSbNZWEhttF5yln RRSQYtW9KZBK8NA2dQ7ibTmx5i+ukG0bP/6HSZAdMwkui5qhL5Tlz6gvTiYKKPfotgSOKu ubZTNLzYNjyRqVKszfi70kHhzF/8HkllLzIzuZjfhZmERQi2kedNn7tltCsV+CRrOMlGhq Hax3TvFxpT+GtY95+A/HlVoj/aGt8XNBIacYUfoqjjIQYpD2RMhYGp/OonlVqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686438542; 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=jMdrbud1ZFikulSUR8zbqwqzZKNRkSMfuYmLPAOM/NI=; b=RGN7owsJtY4RCr7KHmwJ2IflSVKyVxUbNNP5TmSSgA8HMs1QoFFBZcK3Ma64nAlxs9mNmN qfxY+k87TmCwxo9r4LsB/Y4wA2ei4DwCJEXaZIuAa+PWEC490l0K0WhEmE0lUGQPwlR8b+ JUDdXpXKvnGtdizOSmODAXUnTTeZ8TguIIi7gdmDMlfnotxpbRbhmA9T/jTRDYYL6MxHav 8+p/O7F6aNVtu6bbR7d/JeWFC0A+Qoz7hSdz2jdJceNAGEIOYkxFSTz8oU+XRWwjQSb4Rg 27WnB/pxVxQEo5fj0G9F9bQlt+w9umj6LbQ5AxBHcej6BryYTsb1wXJBrlDUzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686438542; a=rsa-sha256; cv=none; b=TBf73feBmZvEWwD+ilfxyNqvZlREcIFNlXRcKUlh7oE//Gyt9QtyBHYcng2G7+wMF0vxYW OSTNXY2GahcT7CXRfbafTwX6Tz+NwhBXfYSKG0hk9fSK/bbKSc6mLpQCKsIgOsATnXg8up c5liNUkcNYm/DbF/IenA7B6syhHoTRB0mJB9Qy37+Fat6lpjj4L1glJ84LjBEbn3bAfzzl OLd6TANz3MvhHbIgfkwV5p2RunvoWvjKsaA1Hcj3L1oS31TMN6YZkey6+VzH863S+biijs i/zj6PyR8c9lRvMNEClZUBEBB+mj3q02JTZieIZYz2rFYes05ym/Q06I2SQxNg== 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 4QdttP6CQHzbTj; Sat, 10 Jun 2023 23:09:01 +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 35AN91iX060733; Sat, 10 Jun 2023 23:09:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35AN91j8060732; Sat, 10 Jun 2023 23:09:01 GMT (envelope-from git) Date: Sat, 10 Jun 2023 23:09:01 GMT Message-Id: <202306102309.35AN91j8060732@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: 51117ed11640 - main - LinuxKPI: 802.11: correct HE_MAC_CAP3 values 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/main X-Git-Reftype: branch X-Git-Commit: 51117ed11640e40e877872065ea039e9f97a9cd0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=51117ed11640e40e877872065ea039e9f97a9cd0 commit 51117ed11640e40e877872065ea039e9f97a9cd0 Author: Bjoern A. Zeeb AuthorDate: 2023-06-10 22:56:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-06-10 23:06:14 +0000 LinuxKPI: 802.11: correct HE_MAC_CAP3 values While we had assigned dummy values so far to HE, correct the HW_MAC_CAP3 values to avoid compile time errors of drivers when shifting values out of range. Sponsored by: The FreeBSD Foundation MFC after: 10 days --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 8b73dc1abe3f..250f07ee0669 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -614,15 +614,14 @@ struct linuxkpi_ieee80211_regdomain { #define IEEE80211_HE_MAC_CAP2_MU_CASCADING 0x40 #define IEEE80211_HE_MAC_CAP2_TRS 0x80 -#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2 0x1 -#define IEEE80211_HE_MAC_CAP3_OMI_CONTROL 0x2 -#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_1 0x10 -#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_2 0x20 -#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3 0x40 -#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK 0x70 +#define IEEE80211_HE_MAC_CAP3_OMI_CONTROL 0x02 +#define IEEE80211_HE_MAC_CAP3_OFDMA_RA 0x04 +#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_1 0x08 +#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_2 0x10 +#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3 0x18 +#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK 0x18 +#define IEEE80211_HE_MAC_CAP3_FLEX_TWT_SCHED 0x40 #define IEEE80211_HE_MAC_CAP3_RX_CTRL_FRAME_TO_MULTIBSS 0x80 -#define IEEE80211_HE_MAC_CAP3_FLEX_TWT_SCHED 0x80 -#define IEEE80211_HE_MAC_CAP3_OFDMA_RA 0x80 #define IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU 0x1 #define IEEE80211_HE_MAC_CAP4_BQR 0x2