From nobody Mon Jun 26 12:09:03 2023 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 4QqRTX004Yz4k79F; Mon, 26 Jun 2023 12:09:03 +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 4QqRTW6XNgz3kFl; Mon, 26 Jun 2023 12:09:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687781343; 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=Cv9o6ISW6I2ZzmcOsnV0trz0ly4LLEKcGdYTtmA6VRw=; b=PbAjTvDN6GKQNn8SqeWfR61G37hwXz2dtsPzrMFzowrd5a+8Emkkp7VxG2wyI8IS9t+Qwc Y8UqRhDrXI0KZ/dXi1UACLhtAAPWC8Cz+BBs1RsN7afJYOrp1cQfGUQNn/l5qEvYlnV0cA a1RPM8K+e7VDblec2DnEZ2WuHba+laSUjcxpeAN7dR7aj/TvsS6RValPoK0G82W/t78l8m JZ3R+v70ke9xg7M3736BW73bh8CCjWqiWGrXJDPSovvGji61ug2UbPK0qG9HUeURO5u/UK DNa6qlNYJSL9UiE463Yf2hapUIEr2Wdp8ofDoGshKXM0ORdwojvbkn5JLIjgEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687781343; 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=Cv9o6ISW6I2ZzmcOsnV0trz0ly4LLEKcGdYTtmA6VRw=; b=dVtVbjNt5O2MlIy/TRL1UI4hH1fwuU3jKwQlHhUl92csdziQcgjKPa583XIT6x6K7Jdwjz 6A/2Hr12i8wWoGlf3o/FKFh5lEv0YVWo3S/W7FSWMueLvqF5XbSiFPM37QLs3k5/92L8Iq gQzCgALlweoP84o/hf87zXBTZ6Tk/RdvspWnaiwW9MA8s5kJsZujumj7TuXAoiYDsBoHC7 xPyvSzuuH2hTdhehhACu+QFxTMkgrp9SBye+SnRCalFEu/3ModZNlzWtUhJfBzgSgTG+H3 1UwlSoeX/x8b9jkcB/tLmviOEVNUTruahuEQFl6urX8L+7QRZEr1zuHnJDVf0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687781343; a=rsa-sha256; cv=none; b=PmYn1xmI05GMtK0CDkIc0TO7nFhdavGhjOR6wEYJ//kF47XL6zslplPqeh1b1mno4UsKPh ZcARJyTJatKq0J04wkt5UXRtNE6CU/Td165pkcdBl3Oev92GRrCaaw81MT5Vdzw9X8NGHD ZKVlQk56C2q+x3MQsz6+lFkHUAZ/SdHZq6c9KZaZwkvZ5cKcPRy5oqw/sCJLLxB1r6vG2z eXc8flfB+XOcUaoahoUHqOSRvNJ1EobxL59QwdSbXzRnvwkkJB3sNRMFDr7IzleT+7jmSN YfJhzvRHql/7w2RJvX9ypdZf+yGhwkK9Wvu9KtRY/wCAWm3lTdA6CVHwkyOwmQ== 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 4QqRTW5d3sz18Cx; Mon, 26 Jun 2023 12:09:03 +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 35QC937v083614; Mon, 26 Jun 2023 12:09:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35QC93Jm083613; Mon, 26 Jun 2023 12:09:03 GMT (envelope-from git) Date: Mon, 26 Jun 2023 12:09:03 GMT Message-Id: <202306261209.35QC93Jm083613@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: 38a7e400656f - stable/13 - LinuxKPI: 802.11: correct HE_MAC_CAP3 values 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 38a7e400656f305389a76b4a1d2971b60ff7193c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=38a7e400656f305389a76b4a1d2971b60ff7193c commit 38a7e400656f305389a76b4a1d2971b60ff7193c Author: Bjoern A. Zeeb AuthorDate: 2023-06-10 22:56:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-06-26 09:25:53 +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 (cherry picked from commit 51117ed11640e40e877872065ea039e9f97a9cd0) --- 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