diff mbox series

iwlwifi: mvm: fix merge damage in iwl_mvm_rx_mpdu_mq()

Message ID 20190130123811.26839-1-luca@coelho.fi (mailing list archive)
State Accepted
Commit 3864be551405b582ae38fbcdfdbb6e49052f5f6d
Delegated to: Kalle Valo
Headers show
Series iwlwifi: mvm: fix merge damage in iwl_mvm_rx_mpdu_mq() | expand

Commit Message

Luca Coelho Jan. 30, 2019, 12:38 p.m. UTC 
From: Luca Coelho <luciano.coelho@intel.com>

A call to iwl_mvm_add_rtap_sniffer_config() was missing due to a merge
damage when I submitted the patch mentioned below.  And this causes
the following compilation warning:

drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c:195:13: warning: 'iwl_mvm_add_rtap_sniffer_config' defined but not used [-Wunused-function]
 static void iwl_mvm_add_rtap_sniffer_config(struct iwl_mvm *mvm,
             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Fix it by adding the if block that calls this function.

Fixes: 9bf13bee2d74 ("iwlwifi: mvm: include configured sniffer AID in radiotap")
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Kalle Valo Jan. 31, 2019, 1:34 p.m. UTC | #1 
Luca Coelho <luca@coelho.fi> wrote:

> From: Luca Coelho <luciano.coelho@intel.com>
> 
> A call to iwl_mvm_add_rtap_sniffer_config() was missing due to a merge
> damage when I submitted the patch mentioned below.  And this causes
> the following compilation warning:
> 
> drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c:195:13: warning: 'iwl_mvm_add_rtap_sniffer_config' defined but not used [-Wunused-function]
>  static void iwl_mvm_add_rtap_sniffer_config(struct iwl_mvm *mvm,
>              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 
> Fix it by adding the if block that calls this function.
> 
> Fixes: 9bf13bee2d74 ("iwlwifi: mvm: include configured sniffer AID in radiotap")
> Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

Patch applied to wireless-drivers-next.git, thanks.

3864be551405 iwlwifi: mvm: fix merge damage in iwl_mvm_rx_mpdu_mq()
diff mbox series

Patch

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
index 995847e1cd7d..b5ff3325c1d3 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
@@ -1476,6 +1476,9 @@  void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,
 		rx_status->ampdu_reference = mvm->ampdu_ref;
 	}
 
+	if (unlikely(mvm->monitor_on))
+		iwl_mvm_add_rtap_sniffer_config(mvm, skb);
+
 	rcu_read_lock();
 
 	if (desc->status & cpu_to_le16(IWL_RX_MPDU_STATUS_SRC_STA_FOUND)) {