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

Commit f5e45f2d authored by Johannes Berg's avatar Johannes Berg
Browse files

iwlwifi: mvm: small cleanups in quota management code 



Use a C99 initializer to clear the command and move the lockdep
assertion before the restart check. Since this causes problems
with the BUILD_BUG_ON() with some compilers, change that a bit.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 17dbe564

drivers/net/wireless/iwlwifi/mvm/quota.c

+5 −6
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static void iwl_mvm_quota_iterator(void *_data, u8 *mac, 


int iwl_mvm_update_quotas(struct iwl_mvm *mvm, struct ieee80211_vif *newvif)

{

	struct iwl_time_quota_cmd cmd;

	struct iwl_time_quota_cmd cmd = {};

	int i, idx, ret, num_active_macs, quota, quota_rem;

	struct iwl_mvm_quota_iterator_data data = {

		.n_interfaces = {},
@@ -139,15 +139,14 @@ int iwl_mvm_update_quotas(struct iwl_mvm *mvm, struct ieee80211_vif *newvif) 
		.new_vif = newvif,

	};



	lockdep_assert_held(&mvm->mutex);



	/* update all upon completion */

	if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status))

		return 0;



	BUILD_BUG_ON(data.colors[MAX_BINDINGS - 1] != -1);



	lockdep_assert_held(&mvm->mutex);



	memset(&cmd, 0, sizeof(cmd));

	/* iterator data above must match */

	BUILD_BUG_ON(MAX_BINDINGS != 4);



	ieee80211_iterate_active_interfaces_atomic(

		mvm->hw, IEEE80211_IFACE_ITER_NORMAL,