Commit 290d5e49 authored by Mordechay Goodstein's avatar Mordechay Goodstein Committed by Kalle Valo
Browse files

iwlwifi: mvm: beacon statistics shouldn't go backwards 



We reset statistics also in case that we didn't reassoc so in
this cases keep last beacon counter.

Cc: stable@vger.kernel.org # v4.19+
Signed-off-by: default avatarMordechay Goodstein <mordechay.goodstein@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/iwlwifi.20200417100405.1f9142751fbc.Ifbfd0f928a0a761110b8f4f2ca5483a61fb21131@changeid
parent b98b33d5

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

+11 −2
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 - 2019 Intel Corporation

 * Copyright(c) 2018 - 2020 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 - 2019 Intel Corporation

 * Copyright(c) 2018 - 2020 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -566,6 +566,7 @@ void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi, 


struct iwl_mvm_stat_data {

	struct iwl_mvm *mvm;

	__le32 flags;

	__le32 mac_id;

	u8 beacon_filter_average_energy;

	void *general;
@@ -606,6 +607,13 @@ static void iwl_mvm_stat_iterator(void *_data, u8 *mac, 
			-general->beacon_average_energy[vif_id];

	}



	/* make sure that beacon statistics don't go backwards with TCM

	 * request to clear statistics

	 */

	if (le32_to_cpu(data->flags) & IWL_STATISTICS_REPLY_FLG_CLEAR)

		mvmvif->beacon_stats.accu_num_beacons +=

			mvmvif->beacon_stats.num_beacons;



	if (mvmvif->id != id)

		return;
@@ -763,6 +771,7 @@ void iwl_mvm_handle_rx_statistics(struct iwl_mvm *mvm, 


		flags = stats->flag;

	}

	data.flags = flags;



	iwl_mvm_rx_stats_check_trigger(mvm, pkt);

CRA Git | Maintained and supported by SUSTech CRA and CCSE