summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Chen <matt.chen@intel.com>2023-07-24 14:40:14 +0800
committeriwlwifi publisher <>2023-07-25 12:22:54 +0000
commit0096c2ca6e66e411c947a58fbb25e17174dd3ed6 (patch)
tree37de622afa2a33a27c1539eb2b67d9a7810950e6
parenta923084809c4b25703ccf7421eeb3fbebafa5bfe (diff)
downloadbackport-iwlwifi-0096c2ca6e66e411c947a58fbb25e17174dd3ed6.tar.gz
wifi: iwlmvm: fw: Add new OEM vendor to tas approved list
Add new oem/odm pair to tas approved vendors list when specified by platform. type=feature ticket=jira:WIFI-324769 Change-Id: I65c3321535674bbc08d96200961a78fab5e7a09f Signed-off-by: Matt Chen <matt.chen@intel.com> Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/66405 Reviewed-by: Goodstein, Mordechay <mordechay.goodstein@intel.com> Tested-by: iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> tested: iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> (cherry picked from commit 1424fbb4ec24c307af3bc24d154550b390bfcf47) Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/66318 Reviewed-by: Ben Ami, Golan <golan.ben.ami@intel.com> PerCI-Ready: Ben Ami, Golan <golan.ben.ami@intel.com> tested: Ben Ami, Golan <golan.ben.ami@intel.com> x-iwlwifi-stack-dev: d186f4cceee02b49ee192435c9b767bea2322175
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/fw.c6
-rw-r--r--versions3
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index b6c7d60c76..fb3d7428fe 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -1214,6 +1214,12 @@ static const struct dmi_system_id dmi_tas_approved_list[] = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
},
},
+ { .ident = "GOOGLE-HP",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Google"),
+ DMI_MATCH(DMI_BOARD_VENDOR, "HP"),
+ },
+ },
{ .ident = "MSI",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International Co., Ltd."),
diff --git a/versions b/versions
index 636f1d5b06..5a7dc15bfa 100644
--- a/versions
+++ b/versions
@@ -2,4 +2,5 @@ BACKPORTS_VERSION="(see git)"
BACKPORTED_KERNEL_VERSION="(see git)"
BACKPORTED_KERNEL_NAME="iwlwifi"
BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__
-BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11342:21f70dee"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core81:11343:d186f4cc"
+BACKPORTS_BRANCH_TSTAMP="Jun 29 2023 12:47:23"