Commit 5860c6f5 authored by Miri Korenblit's avatar Miri Korenblit Committed by Johannes Berg
Browse files

wifi: iwlwifi: move amsdu_size parsing to iwlwifi 



The code that is parsing the amsdu_size module parameter and mapping it
to the corresponding Rx buffer size is common to all opmodes.
Move it into a function in iwlwifi, as preparation to a new op mode we
are working on.

Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Link: https://msgid.link/20240527190228.a3430d32923d.Iab3c22ef0df685f72f22dafc47021f0dc7bd6fa5@changeid


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

drivers/net/wireless/intel/iwlwifi/iwl-modparams.h

+20 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */

/*

 * Copyright (C) 2005-2014, 2018-2022 Intel Corporation

 * Copyright (C) 2005-2014, 2018-2022, 2024 Intel Corporation

 */

#ifndef __iwl_modparams_h__

#define __iwl_modparams_h__
@@ -106,4 +106,23 @@ static inline bool iwl_enable_tx_ampdu(void) 
	return true;

}



/* Verify amsdu_size module parameter and convert it to a rxb size */

static inline enum iwl_amsdu_size

iwl_amsdu_size_to_rxb_size(void)

{

	switch (iwlwifi_mod_params.amsdu_size) {

	case IWL_AMSDU_8K:

		return IWL_AMSDU_8K;

	case IWL_AMSDU_12K:

		return IWL_AMSDU_12K;

	default:

		pr_err("%s: Unsupported amsdu_size: %d\n", KBUILD_MODNAME,

		       iwlwifi_mod_params.amsdu_size);

		fallthrough;

	case IWL_AMSDU_DEF:

	case IWL_AMSDU_4K:

		return IWL_AMSDU_4K;

	}

}



#endif /* #__iwl_modparams_h__ */

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

+1 −18
Original line number Diff line number Diff line
@@ -1373,24 +1373,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, 
	trans_cfg.no_reclaim_cmds = no_reclaim_cmds;

	trans_cfg.n_no_reclaim_cmds = ARRAY_SIZE(no_reclaim_cmds);



	switch (iwlwifi_mod_params.amsdu_size) {

	case IWL_AMSDU_DEF:

		trans_cfg.rx_buf_size = IWL_AMSDU_4K;

		break;

	case IWL_AMSDU_4K:

		trans_cfg.rx_buf_size = IWL_AMSDU_4K;

		break;

	case IWL_AMSDU_8K:

		trans_cfg.rx_buf_size = IWL_AMSDU_8K;

		break;

	case IWL_AMSDU_12K:

		trans_cfg.rx_buf_size = IWL_AMSDU_12K;

		break;

	default:

		pr_err("%s: Unsupported amsdu_size: %d\n", KBUILD_MODNAME,

		       iwlwifi_mod_params.amsdu_size);

		trans_cfg.rx_buf_size = IWL_AMSDU_4K;

	}

	trans_cfg.rx_buf_size = iwl_amsdu_size_to_rxb_size();



	trans->wide_cmd_header = true;

	trans_cfg.bc_table_dword =