[BUGFIX] iwlwifi: mvm: consider P2p device type for firmware dump triggers
When the user really wanted a dump on P2P Client, he
coudln't get it because we checked vif->type but didn't
take vif->p2p into account. Fix that.
type=bugfix
fixes=unknown
bug=not-tracked
Change-Id: Ie5cf5269f16dbd315d4d6a10e98e7957468040c6
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Reviewed-on: https://git-amr-3.devtools.intel.com/gerrit/44041
Tested-by: ec ger unix iil jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Ben Ami, Golan <golan.ben.ami@intel.com>
(cherry picked from commit 5d6dc600431b3ef206518ce8024631db788dcb8b)
Reviewed-on: https://git-amr-3.devtools.intel.com/gerrit/44093
x-iwlwifi-stack-dev: 74461baa1550b01a59f18075523dde112e80777b
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.h b/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.h
index f7dff76..e9f1be9 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.h
@@ -105,7 +105,8 @@
{
u32 trig_vif = le32_to_cpu(trig->vif_type);
- return trig_vif == IWL_FW_DBG_CONF_VIF_ANY || vif->type == trig_vif;
+ return trig_vif == IWL_FW_DBG_CONF_VIF_ANY ||
+ ieee80211_vif_type_p2p(vif) == trig_vif;
}
static inline bool
diff --git a/versions b/versions
index 3963298..7ca6477 100644
--- a/versions
+++ b/versions
@@ -2,5 +2,5 @@
BACKPORTED_KERNEL_VERSION="(see git)"
BACKPORTED_KERNEL_NAME="iwlwifi"
BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__
-BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/LinuxCore18:5210:32a3f360"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/LinuxCore18:5211:74461baa"
BACKPORTS_BRANCH_TSTAMP="Feb 08 2016 08:09:37"
