From nobody Sun Jan 16 23:20:59 2022 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 D4F8A1967AB5; Sun, 16 Jan 2022 23:21:01 +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 4JcWHd12Wtz3mKP; Sun, 16 Jan 2022 23:21:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642375261; 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=rt4LFO73Q+TYIEnMqYYfqBEsF1DqbxO3azRh11bvHV8=; b=UCEjIY4UTIQ5LoGjqpPUIUIfC91g9BrdGgzmAKm23wlr0x46c7guieNX4CLAfwJ/yt4ECM 88vbbjPD4nTQfWUpms4qXVXBdAeMODhthZEfWPZZdUdN7tlJmVUaDr9OCthyjbsLo1owsx bez9PFK2l8Ar5sWfa6RoD8ir5ySOPp2vWitbfwSecjfxqSQNM5wCv8ZDk/244CgosaVBdr Mf5PpjeNcwCBrVSCSr/su9QaNO0K0tUGVPe04vcx0hISnwoVbf0u5UikfGa7+giKVZT1e4 AaoIW5+jkb6xpZ6Mi4hXR08vy0/wjD+mt6MDnV+MwLDj0hJisV1V5c/puLfe0Q== 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 6419223055; Sun, 16 Jan 2022 23:20:59 +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 20GNKxeJ053668; Sun, 16 Jan 2022 23:20:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20GNKxcs053667; Sun, 16 Jan 2022 23:20:59 GMT (envelope-from git) Date: Sun, 16 Jan 2022 23:20:59 GMT Message-Id: <202201162320.20GNKxcs053667@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: cb6bb87184a5 - stable/13 - LinuxKPI / iwlwifi: fix spelling of constants 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: cb6bb87184a57dbd9a474f7100c89f0fe7674a9e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642375261; 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=rt4LFO73Q+TYIEnMqYYfqBEsF1DqbxO3azRh11bvHV8=; b=xP30NLPJThjeWIVmm0qvbJ3HTWHBgfOk6kVYk81JI8Euq+wLbzHf7L23g+wOGOWmGjOZ4S twqWRIICJarFEJXmgNV6BggFKQ3bCsu1JRk2STqm6TFgFc/2n0U5dF5GnPWojfAS8URY5u 2rtReHMQ9oJon4xknsgbUyXBFbKNIMXIUvMi+94IxSkPgdEO4Xqa1TB/oik1CKYkENUYoy a3Ouw+GTH2b75sY26qzehrq0Ahnp/h4KiZn0StxZe433ErxSzwzcp6k8Knx07/v9keNG7R hMe2ERv5UgAGinSD7J5DwQ/3t8Emhv6oCOYC6ubSgdCJ9O6kJhuB6SVQN94SUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642375261; a=rsa-sha256; cv=none; b=dGqUcjBShoNWx6IZkJSzoz0X42YKcvntKrPoPpxgOpiFVWkZ6vIQuFDDsmZIgi2RP1UGAw 0GqhogeIzngdFV4ShWxyzHdj3RvBlbVgFIEQkhhYRgAQvxgPziepeAocPwEynICIQwpItV i7ZjtkYKrd+tbo4OAtgrekMbJ5BU+mqwX57HTTKYE3WmHADRZ85FqRYCj7TyWtS2mogfCs Z+GXzx+ZFxN+J2TZIWbY3PyjwrQVSISlJswSJkhwhgelnhgWp4wuvxPUU2bjvIAeHaTrgN 7kjA7HWj2IUxv1BEiBoGyFjFGHIDDZ7PKxOZsvYyr25DSbxsPUwF3+Io25BPnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=cb6bb87184a57dbd9a474f7100c89f0fe7674a9e commit cb6bb87184a57dbd9a474f7100c89f0fe7674a9e Author: Bjoern A. Zeeb AuthorDate: 2022-01-09 02:21:05 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-01-16 22:39:16 +0000 LinuxKPI / iwlwifi: fix spelling of constants Fix the spelling of IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_* (was "NOMIMAL"). The original version came from iwlwifi in iwlwifi-next. Other drivers (from wireless-testing) already use the correct spelling and need this change in LinuxKPI. Sponsored by: The FreeBSD Foundation (cherry picked from commit e200809190fd8472fe525b2527ff1122b37999ac) --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 10 +++++----- sys/contrib/dev/iwlwifi/iwl-nvm-parse.c | 4 ++-- sys/contrib/dev/iwlwifi/mvm/mac80211.c | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 595d65a6ad71..edecf9bed8a2 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -678,11 +678,11 @@ struct linuxkpi_ieee80211_regdomain { #define IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_242 0x10 #define IEEE80211_HE_PHY_CAP8_HE_ER_SU_PPDU_4XLTF_AND_08_US_GI 0x20 -#define IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_0US 0x1 -#define IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_16US 0x2 -#define IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_8US 0x4 -#define IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_MASK 0x8 -#define IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED 0x10 +#define IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_0US 0x1 +#define IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US 0x2 +#define IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_8US 0x4 +#define IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK 0x8 +#define IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_RESERVED 0x10 #define IEEE80211_HE_PHY_CAP9_NON_TRIGGERED_CQI_FEEDBACK 0x20 #define IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB 0x40 #define IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB 0x80 diff --git a/sys/contrib/dev/iwlwifi/iwl-nvm-parse.c b/sys/contrib/dev/iwlwifi/iwl-nvm-parse.c index f992546a0e98..f23b15cf3c7b 100644 --- a/sys/contrib/dev/iwlwifi/iwl-nvm-parse.c +++ b/sys/contrib/dev/iwlwifi/iwl-nvm-parse.c @@ -607,7 +607,7 @@ static const struct ieee80211_sband_iftype_data iwl_he_capa[] = { .phy_cap_info[9] = IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB | IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB | - IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED, + IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_RESERVED, .phy_cap_info[10] = IEEE80211_HE_PHY_CAP10_HE_MU_M1RU_MAX_LTF, }, @@ -664,7 +664,7 @@ static const struct ieee80211_sband_iftype_data iwl_he_capa[] = { IEEE80211_HE_PHY_CAP8_HE_ER_SU_PPDU_4XLTF_AND_08_US_GI | IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_242, .phy_cap_info[9] = - IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED, + IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_RESERVED, }, /* * Set default Tx/Rx HE MCS NSS Support field. diff --git a/sys/contrib/dev/iwlwifi/mvm/mac80211.c b/sys/contrib/dev/iwlwifi/mvm/mac80211.c index cf116404d985..2eec7f826b33 100644 --- a/sys/contrib/dev/iwlwifi/mvm/mac80211.c +++ b/sys/contrib/dev/iwlwifi/mvm/mac80211.c @@ -2157,23 +2157,23 @@ static void iwl_mvm_cfg_he_sta(struct iwl_mvm *mvm, flags |= STA_CTXT_HE_PACKET_EXT; } else if ((sta->he_cap.he_cap_elem.phy_cap_info[9] & - IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_MASK) != - IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED) { + IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK) != + IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_RESERVED) { int low_th = -1; int high_th = -1; /* Take the PPE thresholds from the nominal padding info */ switch (sta->he_cap.he_cap_elem.phy_cap_info[9] & - IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_MASK) { - case IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_0US: + IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK) { + case IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_0US: low_th = IWL_HE_PKT_EXT_NONE; high_th = IWL_HE_PKT_EXT_NONE; break; - case IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_8US: + case IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_8US: low_th = IWL_HE_PKT_EXT_BPSK; high_th = IWL_HE_PKT_EXT_NONE; break; - case IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_16US: + case IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US: low_th = IWL_HE_PKT_EXT_NONE; high_th = IWL_HE_PKT_EXT_BPSK; break;