Commit f25c418d authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Luca Coelho
Browse files

iwlwifi: remove antenna_coupling module parameter 



This module parameter should not be mangled by users.
This relates to a very old driver and I doubt people can
really check the antenna coupling in a way that would make
the BT Coexistence work better with a real value.
Drop it.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20200424182644.6e566897ce0a.I8395a50c1c39522e542366064bff33a33009ce7b@changeid
parent cc9b6012

drivers/net/wireless/intel/iwlwifi/dvm/dev.h

+1 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/******************************************************************************

 *

 * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2003 - 2014, 2020 Intel Corporation. All rights reserved.

 *

 * Contact Information:

 *  Intel Linux Wireless <linuxwifi@intel.com>
@@ -810,7 +810,6 @@ struct iwl_priv { 
	u8 bt_traffic_load, last_bt_traffic_load;

	bool bt_ch_announce;

	bool bt_full_concurrent;

	bool bt_ant_couple_ok;

	__le32 kill_ack_mask;

	__le32 kill_cts_mask;

	__le16 bt_valid;

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

+1 −8
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/******************************************************************************

 *

 * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2003 - 2014, 2018 - 2020  Intel Corporation. All rights reserved.

 * Copyright(c) 2015 Intel Deutschland GmbH

 * Copyright (C) 2018 - 2019 Intel Corporation

 *

 * Portions of this file are derived from the ipw3945 project, as well

 * as portions of the ieee80211 subsystem header files.
@@ -1370,12 +1369,6 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 


	IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");



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

	priv->bt_ant_couple_ok =

		(iwlwifi_mod_params.antenna_coupling >

			IWL_BT_ANTENNA_COUPLING_THRESHOLD) ?

			true : false;



	/* bt channel inhibition enabled*/

	priv->bt_ch_announce = true;

	IWL_DEBUG_INFO(priv, "BT channel inhibition is %s\n",

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

+1 −10
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/******************************************************************************

 *

 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

 * Copyright (C) 2019 - 2020 Intel Corporation

 *

 * Contact Information:

 *  Intel Linux Wireless <linuxwifi@intel.com>
@@ -846,16 +847,6 @@ static void rs_bt_update_lq(struct iwl_priv *priv, struct iwl_rxon_context *ctx, 
	struct iwl_scale_tbl_info *tbl;

	bool full_concurrent = priv->bt_full_concurrent;



	if (priv->bt_ant_couple_ok) {

		/*

		 * Is there a need to switch between

		 * full concurrency and 3-wire?

		 */

		if (priv->bt_ci_compliance)

			full_concurrent = true;

		else

			full_concurrent = false;

	}

	if ((priv->bt_traffic_load != priv->last_bt_traffic_load) ||

	    (priv->bt_full_concurrent != full_concurrent)) {

		priv->bt_full_concurrent = full_concurrent;

drivers/net/wireless/intel/iwlwifi/iwl-drv.c

+2 −9
Original line number Diff line number Diff line
@@ -5,10 +5,9 @@ 
 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2007 - 2014, 2018 - 2020  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

 *

 * 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
@@ -28,10 +27,9 @@ 
 *

 * BSD LICENSE

 *

 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2005 - 2014, 2018 - 2020 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

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -1824,11 +1822,6 @@ MODULE_PARM_DESC(amsdu_size, 
module_param_named(fw_restart, iwlwifi_mod_params.fw_restart, bool, 0444);

MODULE_PARM_DESC(fw_restart, "restart firmware in case of error (default true)");



module_param_named(antenna_coupling, iwlwifi_mod_params.antenna_coupling,

		   int, 0444);

MODULE_PARM_DESC(antenna_coupling,

		 "specify antenna coupling in dB (default: 0 dB)");



module_param_named(nvm_file, iwlwifi_mod_params.nvm_file, charp, 0444);

MODULE_PARM_DESC(nvm_file, "NVM file name");

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

+2 −6
Original line number Diff line number Diff line
@@ -5,8 +5,7 @@ 
 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2018 - 2019 Intel Corporation

 * Copyright(c) 2007 - 2014, 2018 - 2020 Intel Corporation. All rights reserved.

 *

 * 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
@@ -26,8 +25,7 @@ 
 *

 * BSD LICENSE

 *

 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2018 - 2019 Intel Corporation

 * Copyright(c) 2005 - 2014, 2018 - 2020 Intel Corporation. All rights reserved.

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -111,7 +109,6 @@ enum iwl_uapsd_disable { 
 * @power_save: enable power save, default = false

 * @power_level: power level, default = 1

 * @debug_level: levels are IWL_DL_*

 * @antenna_coupling: antenna coupling in dB, default = 0

 * @nvm_file: specifies a external NVM file

 * @uapsd_disable: disable U-APSD, see &enum iwl_uapsd_disable, default =

 *	IWL_DISABLE_UAPSD_BSS | IWL_DISABLE_UAPSD_P2P_CLIENT
@@ -131,7 +128,6 @@ struct iwl_mod_params { 
#ifdef CONFIG_IWLWIFI_DEBUG

	u32 debug_level;

#endif

	int antenna_coupling;

	char *nvm_file;

	u32 uapsd_disable;

	bool disable_11ac;