Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d47cdb88 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: mvm: report all NO_DATA events to mac80211 



Report all NO_DATA events to mac80211 so they get captured
in radiotap for usage in sniffer scenarios; map the info
type to a reasonable radiotap type for this.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 79221126

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+4 −4
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018        Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -31,7 +31,7 @@ 
 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018        Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -1650,7 +1650,7 @@ void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi, 
			struct iwl_rx_cmd_buffer *rxb);

void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,

			struct iwl_rx_cmd_buffer *rxb, int queue);

void iwl_mvm_rx_monitor_ndp(struct iwl_mvm *mvm, struct napi_struct *napi,

void iwl_mvm_rx_monitor_no_data(struct iwl_mvm *mvm, struct napi_struct *napi,

				struct iwl_rx_cmd_buffer *rxb, int queue);

void iwl_mvm_rx_frame_release(struct iwl_mvm *mvm, struct napi_struct *napi,

			      struct iwl_rx_cmd_buffer *rxb, int queue);

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

+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018        Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -31,7 +31,7 @@ 
 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018        Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -1105,7 +1105,7 @@ static void iwl_mvm_rx_mq(struct iwl_op_mode *op_mode, 
	else if (cmd == WIDE_ID(LEGACY_GROUP, FRAME_RELEASE))

		iwl_mvm_rx_frame_release(mvm, napi, rxb, 0);

	else if (cmd == WIDE_ID(DATA_PATH_GROUP, RX_NO_DATA_NOTIF))

		iwl_mvm_rx_monitor_ndp(mvm, napi, rxb, 0);

		iwl_mvm_rx_monitor_no_data(mvm, napi, rxb, 0);

	else

		iwl_mvm_rx_common(mvm, rxb, pkt);

}

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

+20 −11
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2015 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -31,7 +31,7 @@ 
 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2015 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -1679,7 +1679,7 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi, 
	rcu_read_unlock();

}



void iwl_mvm_rx_monitor_ndp(struct iwl_mvm *mvm, struct napi_struct *napi,

void iwl_mvm_rx_monitor_no_data(struct iwl_mvm *mvm, struct napi_struct *napi,

				struct iwl_rx_cmd_buffer *rxb, int queue)

{

	struct ieee80211_rx_status *rx_status;
@@ -1701,10 +1701,6 @@ void iwl_mvm_rx_monitor_ndp(struct iwl_mvm *mvm, struct napi_struct *napi, 
	if (unlikely(test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status)))

		return;



	/* Currently only NDP type is supported */

	if (info_type != RX_NO_DATA_INFO_TYPE_NDP)

		return;



	energy_a = (rssi & RX_NO_DATA_CHAIN_A_MSK) >> RX_NO_DATA_CHAIN_A_POS;

	energy_b = (rssi & RX_NO_DATA_CHAIN_B_MSK) >> RX_NO_DATA_CHAIN_B_POS;

	channel = (rssi & RX_NO_DATA_CHANNEL_MSK) >> RX_NO_DATA_CHANNEL_POS;
@@ -1726,9 +1722,22 @@ void iwl_mvm_rx_monitor_ndp(struct iwl_mvm *mvm, struct napi_struct *napi, 


	/* 0-length PSDU */

	rx_status->flag |= RX_FLAG_NO_PSDU;

	/* currently this is the only type for which we get this notif */



	switch (info_type) {

	case RX_NO_DATA_INFO_TYPE_NDP:

		rx_status->zero_length_psdu_type =

			IEEE80211_RADIOTAP_ZERO_LEN_PSDU_SOUNDING;

		break;

	case RX_NO_DATA_INFO_TYPE_MU_UNMATCHED:

	case RX_NO_DATA_INFO_TYPE_HE_TB_UNMATCHED:

		rx_status->zero_length_psdu_type =

			IEEE80211_RADIOTAP_ZERO_LEN_PSDU_NOT_CAPTURED;

		break;

	default:

		rx_status->zero_length_psdu_type =

			IEEE80211_RADIOTAP_ZERO_LEN_PSDU_VENDOR;

		break;

	}



	/* This may be overridden by iwl_mvm_rx_he() to HE_RU */

	switch (rate_n_flags & RATE_MCS_CHAN_WIDTH_MSK) {