* pull-request: iwlwifi 2016-08-29
@ 2016-08-29 19:37 Luca Coelho
2016-08-29 19:39 ` [PATCH 1/4] iwlwifi: mvm: consider P2p device type for firmware dump triggers Luca Coelho
2016-09-01 14:13 ` pull-request: iwlwifi 2016-08-29 Kalle Valo
0 siblings, 2 replies; 6+ messages in thread
From: Luca Coelho @ 2016-08-29 19:37 UTC (permalink / raw)
To: kvalo; +Cc: linux-wireless, linuxwifi
[-- Attachment #1: Type: text/plain, Size: 1666 bytes --]
Hi Kalle,
Here are 4 patches intended for 4.8. They are all very small and low
risk, but fix some actual issues. More details in the tag description.
Let me know if everything's fine (or not). :)
Luca.
The following changes since commit bb87f02b7e4ccdb614a83cbf840524de81e9b321:
Merge ath-current from ath.git (2016-08-29 21:39:04 +0300)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes.git tags/iwlwifi-for-kalle-2016-08-29
for you to fetch changes up to a904a08b5fee5317ff0f7b8212aa5d0776795a52:
iwlwifi: mvm: Advertise support for AP channel width change (2016-08-29 22:29:06 +0300)
----------------------------------------------------------------
* Fix P2P dump trigger
* Prevent a potential null dereference in iwlmvm
* Prevent an uninitialized value from being returned in iwlmvm
* Advertise support for channel width change in AP mode
----------------------------------------------------------------
Emmanuel Grumbach (2):
iwlwifi: mvm: consider P2p device type for firmware dump triggers
iwlwifi: mvm: don't use ret when not initialised
Peer, Ilan (1):
iwlwifi: mvm: Advertise support for AP channel width change
Sharon Dvir (1):
iwlwifi: mvm: check if vif is NULL before using it
drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 3 ++-
drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.h | 3 ++-
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 1 +
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 ++
4 files changed, 7 insertions(+), 2 deletions(-)
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/4] iwlwifi: mvm: consider P2p device type for firmware dump triggers
2016-08-29 19:37 pull-request: iwlwifi 2016-08-29 Luca Coelho
@ 2016-08-29 19:39 ` Luca Coelho
2016-08-29 19:39 ` [PATCH 2/4] iwlwifi: mvm: check if vif is NULL before using it Luca Coelho
` (2 more replies)
2016-09-01 14:13 ` pull-request: iwlwifi 2016-08-29 Kalle Valo
1 sibling, 3 replies; 6+ messages in thread
From: Luca Coelho @ 2016-08-29 19:39 UTC (permalink / raw)
To: linux-wireless; +Cc: Emmanuel Grumbach, Luca Coelho
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
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.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 @@ iwl_fw_dbg_trigger_vif_match(struct iwl_fw_dbg_trigger_tlv *trig,
{
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
--
2.8.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4] iwlwifi: mvm: check if vif is NULL before using it
2016-08-29 19:39 ` [PATCH 1/4] iwlwifi: mvm: consider P2p device type for firmware dump triggers Luca Coelho
@ 2016-08-29 19:39 ` Luca Coelho
2016-08-29 19:39 ` [PATCH 3/4] iwlwifi: mvm: don't use ret when not initialised Luca Coelho
2016-08-29 19:39 ` [PATCH 4/4] iwlwifi: mvm: Advertise support for AP channel width change Luca Coelho
2 siblings, 0 replies; 6+ messages in thread
From: Luca Coelho @ 2016-08-29 19:39 UTC (permalink / raw)
To: linux-wireless; +Cc: Sharon Dvir, Luca Coelho
From: Sharon Dvir <sharon.dvir@intel.com>
wdev_to_ieee80211_vif() might return NULL.
Check that vif != NULL before dereferencing it.
Signed-off-by: Sharon Dvir <sharon.dvir@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index b4fc86d..6a615bb 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -467,6 +467,8 @@ struct iwl_mvm_vif {
static inline struct iwl_mvm_vif *
iwl_mvm_vif_from_mac80211(struct ieee80211_vif *vif)
{
+ if (!vif)
+ return NULL;
return (void *)vif->drv_priv;
}
--
2.8.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] iwlwifi: mvm: don't use ret when not initialised
2016-08-29 19:39 ` [PATCH 1/4] iwlwifi: mvm: consider P2p device type for firmware dump triggers Luca Coelho
2016-08-29 19:39 ` [PATCH 2/4] iwlwifi: mvm: check if vif is NULL before using it Luca Coelho
@ 2016-08-29 19:39 ` Luca Coelho
2016-08-29 19:39 ` [PATCH 4/4] iwlwifi: mvm: Advertise support for AP channel width change Luca Coelho
2 siblings, 0 replies; 6+ messages in thread
From: Luca Coelho @ 2016-08-29 19:39 UTC (permalink / raw)
To: linux-wireless; +Cc: Emmanuel Grumbach, Luca Coelho
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
fw-dbg code return ret but that variable was either 0
or not initialised. Return 0 always.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Fixes: 6a95126763fb ("iwlwifi: mvm: send dbg config hcmds to fw if set in tlv")
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c
index 1abcabb..46b52bf 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c
@@ -960,5 +960,6 @@ int iwl_mvm_start_fw_dbg_conf(struct iwl_mvm *mvm, u8 conf_id)
}
mvm->fw_dbg_conf = conf_id;
- return ret;
+
+ return 0;
}
--
2.8.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/4] iwlwifi: mvm: Advertise support for AP channel width change
2016-08-29 19:39 ` [PATCH 1/4] iwlwifi: mvm: consider P2p device type for firmware dump triggers Luca Coelho
2016-08-29 19:39 ` [PATCH 2/4] iwlwifi: mvm: check if vif is NULL before using it Luca Coelho
2016-08-29 19:39 ` [PATCH 3/4] iwlwifi: mvm: don't use ret when not initialised Luca Coelho
@ 2016-08-29 19:39 ` Luca Coelho
2 siblings, 0 replies; 6+ messages in thread
From: Luca Coelho @ 2016-08-29 19:39 UTC (permalink / raw)
To: linux-wireless; +Cc: Peer, Ilan, Luca Coelho
From: "Peer, Ilan" <ilan.peer@intel.com>
The iwlmvm driver supports channel width change in AP mode. Add the
proper flag.
Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 6d60645..5dd77e3 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -624,6 +624,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
hw->wiphy->features |= NL80211_FEATURE_P2P_GO_CTWIN |
NL80211_FEATURE_LOW_PRIORITY_SCAN |
NL80211_FEATURE_P2P_GO_OPPPS |
+ NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE |
NL80211_FEATURE_DYNAMIC_SMPS |
NL80211_FEATURE_STATIC_SMPS |
NL80211_FEATURE_SUPPORTS_WMM_ADMISSION;
--
2.8.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: pull-request: iwlwifi 2016-08-29
2016-08-29 19:37 pull-request: iwlwifi 2016-08-29 Luca Coelho
2016-08-29 19:39 ` [PATCH 1/4] iwlwifi: mvm: consider P2p device type for firmware dump triggers Luca Coelho
@ 2016-09-01 14:13 ` Kalle Valo
1 sibling, 0 replies; 6+ messages in thread
From: Kalle Valo @ 2016-09-01 14:13 UTC (permalink / raw)
To: Luca Coelho; +Cc: linux-wireless, linuxwifi
Luca Coelho <luca@coelho.fi> writes:
> Here are 4 patches intended for 4.8. They are all very small and low
> risk, but fix some actual issues. More details in the tag description.
>
> Let me know if everything's fine (or not). :)
>
> Luca.
>
>
> The following changes since commit bb87f02b7e4ccdb614a83cbf840524de81e9b321:
>
> Merge ath-current from ath.git (2016-08-29 21:39:04 +0300)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes.git tags/iwlwifi-for-kalle-2016-08-29
Pulled, thanks.
--
Kalle Valo
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-09-01 14:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-29 19:37 pull-request: iwlwifi 2016-08-29 Luca Coelho
2016-08-29 19:39 ` [PATCH 1/4] iwlwifi: mvm: consider P2p device type for firmware dump triggers Luca Coelho
2016-08-29 19:39 ` [PATCH 2/4] iwlwifi: mvm: check if vif is NULL before using it Luca Coelho
2016-08-29 19:39 ` [PATCH 3/4] iwlwifi: mvm: don't use ret when not initialised Luca Coelho
2016-08-29 19:39 ` [PATCH 4/4] iwlwifi: mvm: Advertise support for AP channel width change Luca Coelho
2016-09-01 14:13 ` pull-request: iwlwifi 2016-08-29 Kalle Valo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.