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

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

iwlwifi: unify external & internal modparam names 



Where possible (all except for "11n_disable", which isn't valid in C)
rename the internal names for module parameters to be the same as the
externally visible names, to aid finding their use etc.

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

drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c

+3 −3
Original line number Diff line number Diff line
@@ -2308,10 +2308,10 @@ static ssize_t iwl_dbgfs_fw_restart_write(struct file *file, 
					  size_t count, loff_t *ppos)

{

	struct iwl_priv *priv = file->private_data;

	bool restart_fw = iwlwifi_mod_params.restart_fw;

	bool fw_restart = iwlwifi_mod_params.fw_restart;

	int __maybe_unused ret;



	iwlwifi_mod_params.restart_fw = true;

	iwlwifi_mod_params.fw_restart = true;



	mutex_lock(&priv->mutex);
@@ -2320,7 +2320,7 @@ static ssize_t iwl_dbgfs_fw_restart_write(struct file *file, 


	mutex_unlock(&priv->mutex);



	iwlwifi_mod_params.restart_fw = restart_fw;

	iwlwifi_mod_params.fw_restart = fw_restart;



	return count;

}

drivers/net/wireless/intel/iwlwifi/dvm/lib.c

+1 −1
Original line number Diff line number Diff line
@@ -1157,7 +1157,7 @@ int iwlagn_suspend(struct iwl_priv *priv, struct cfg80211_wowlan *wowlan) 
	if (ret)

		goto out;



	if (!iwlwifi_mod_params.sw_crypto) {

	if (!iwlwifi_mod_params.swcrypto) {

		/* mark all keys clear */

		priv->ucode_key_table = 0;

		ctx->key_mapping_keys = 0;

drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c

+4 −4
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv, 
	 * packets, so enabling it with software crypto isn't safe)

	 */

	if (priv->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_MFP &&

	    !iwlwifi_mod_params.sw_crypto)

	    !iwlwifi_mod_params.swcrypto)

		ieee80211_hw_set(hw, MFP_CAPABLE);



	hw->sta_data_size = sizeof(struct iwl_station_priv);
@@ -171,7 +171,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv, 
					     WIPHY_WOWLAN_DISCONNECT |

					     WIPHY_WOWLAN_EAP_IDENTITY_REQ |

					     WIPHY_WOWLAN_RFKILL_RELEASE;

		if (!iwlwifi_mod_params.sw_crypto)

		if (!iwlwifi_mod_params.swcrypto)

			priv->wowlan_support.flags |=

				WIPHY_WOWLAN_SUPPORTS_GTK_REKEY |

				WIPHY_WOWLAN_GTK_REKEY_FAILURE;
@@ -348,7 +348,7 @@ static void iwlagn_mac_set_rekey_data(struct ieee80211_hw *hw, 
{

	struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);



	if (iwlwifi_mod_params.sw_crypto)

	if (iwlwifi_mod_params.swcrypto)

		return;



	IWL_DEBUG_MAC80211(priv, "enter\n");
@@ -624,7 +624,7 @@ static int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 


	IWL_DEBUG_MAC80211(priv, "enter\n");



	if (iwlwifi_mod_params.sw_crypto) {

	if (iwlwifi_mod_params.swcrypto) {

		IWL_DEBUG_MAC80211(priv, "leave - hwcrypto disabled\n");

		return -EOPNOTSUPP;

	}

drivers/net/wireless/intel/iwlwifi/dvm/main.c

+2 −2
Original line number Diff line number Diff line
@@ -1371,7 +1371,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 


	/* is antenna coupling more than 35dB ? */

	priv->bt_ant_couple_ok =

		(iwlwifi_mod_params.ant_coupling >

		(iwlwifi_mod_params.antenna_coupling >

			IWL_BT_ANTENNA_COUPLING_THRESHOLD) ?

			true : false;
@@ -1958,7 +1958,7 @@ static void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand) 
	}



	if (!test_bit(STATUS_EXIT_PENDING, &priv->status)) {

		if (iwlwifi_mod_params.restart_fw) {

		if (iwlwifi_mod_params.fw_restart) {

			IWL_DEBUG_FW_ERRORS(priv,

				  "Restarting adapter due to uCode error.\n");

			queue_work(priv->workqueue, &priv->restart);

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

+1 −1
Original line number Diff line number Diff line
@@ -639,7 +639,7 @@ static void iwlagn_pass_packet_to_mac80211(struct iwl_priv *priv, 
	}



	/* In case of HW accelerated crypto and bad decryption, drop */

	if (!iwlwifi_mod_params.sw_crypto &&

	if (!iwlwifi_mod_params.swcrypto &&

	    iwlagn_set_decrypted_flag(priv, hdr, ampdu_status, stats))

		return;