Commit 3864be55 authored by Luca Coelho's avatar Luca Coelho Committed by Kalle Valo
Browse files

iwlwifi: mvm: fix merge damage in iwl_mvm_rx_mpdu_mq() 



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: 9bf13bee ("iwlwifi: mvm: include configured sniffer AID in radiotap")
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent d4065e90

drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c

+3 −0
Original line number Diff line number Diff line
@@ -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)) {