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

Commit 85560af3 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlwifi: remove support_wimax_coexist 



There's no device using this mechanism.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d9df23e9

drivers/net/wireless/iwlwifi/iwl-shared.h

+0 −2
Original line number Diff line number Diff line
@@ -217,7 +217,6 @@ enum iwl_led_mode { 
 * @chain_noise_num_beacons: number of beacons used to compute chain noise

 * @adv_thermal_throttle: support advance thermal throttle

 * @support_ct_kill_exit: support ct kill exit condition

 * @support_wimax_coexist: support wimax/wifi co-exist

 * @plcp_delta_threshold: plcp error rate threshold used to trigger

 *	radio tuning when there is a high receiving plcp error rate

 * @chain_noise_scale: default chain noise scale used for gain computation
@@ -240,7 +239,6 @@ struct iwl_base_params { 
	u16 led_compensation;

	bool adv_thermal_throttle;

	bool support_ct_kill_exit;

	const bool support_wimax_coexist;

	u8 plcp_delta_threshold;

	s32 chain_noise_scale;

	unsigned int wd_timeout;

drivers/net/wireless/iwlwifi/iwl-ucode.c

+2 −49
Original line number Diff line number Diff line
@@ -40,37 +40,6 @@ 
#include "iwl-fh.h"

#include "iwl-op-mode.h"



static struct iwl_wimax_coex_event_entry cu_priorities[COEX_NUM_OF_EVENTS] = {

	{COEX_CU_UNASSOC_IDLE_RP, COEX_CU_UNASSOC_IDLE_WP,

	 0, COEX_UNASSOC_IDLE_FLAGS},

	{COEX_CU_UNASSOC_MANUAL_SCAN_RP, COEX_CU_UNASSOC_MANUAL_SCAN_WP,

	 0, COEX_UNASSOC_MANUAL_SCAN_FLAGS},

	{COEX_CU_UNASSOC_AUTO_SCAN_RP, COEX_CU_UNASSOC_AUTO_SCAN_WP,

	 0, COEX_UNASSOC_AUTO_SCAN_FLAGS},

	{COEX_CU_CALIBRATION_RP, COEX_CU_CALIBRATION_WP,

	 0, COEX_CALIBRATION_FLAGS},

	{COEX_CU_PERIODIC_CALIBRATION_RP, COEX_CU_PERIODIC_CALIBRATION_WP,

	 0, COEX_PERIODIC_CALIBRATION_FLAGS},

	{COEX_CU_CONNECTION_ESTAB_RP, COEX_CU_CONNECTION_ESTAB_WP,

	 0, COEX_CONNECTION_ESTAB_FLAGS},

	{COEX_CU_ASSOCIATED_IDLE_RP, COEX_CU_ASSOCIATED_IDLE_WP,

	 0, COEX_ASSOCIATED_IDLE_FLAGS},

	{COEX_CU_ASSOC_MANUAL_SCAN_RP, COEX_CU_ASSOC_MANUAL_SCAN_WP,

	 0, COEX_ASSOC_MANUAL_SCAN_FLAGS},

	{COEX_CU_ASSOC_AUTO_SCAN_RP, COEX_CU_ASSOC_AUTO_SCAN_WP,

	 0, COEX_ASSOC_AUTO_SCAN_FLAGS},

	{COEX_CU_ASSOC_ACTIVE_LEVEL_RP, COEX_CU_ASSOC_ACTIVE_LEVEL_WP,

	 0, COEX_ASSOC_ACTIVE_LEVEL_FLAGS},

	{COEX_CU_RF_ON_RP, COEX_CU_RF_ON_WP, 0, COEX_CU_RF_ON_FLAGS},

	{COEX_CU_RF_OFF_RP, COEX_CU_RF_OFF_WP, 0, COEX_RF_OFF_FLAGS},

	{COEX_CU_STAND_ALONE_DEBUG_RP, COEX_CU_STAND_ALONE_DEBUG_WP,

	 0, COEX_STAND_ALONE_DEBUG_FLAGS},

	{COEX_CU_IPAN_ASSOC_LEVEL_RP, COEX_CU_IPAN_ASSOC_LEVEL_WP,

	 0, COEX_IPAN_ASSOC_LEVEL_FLAGS},

	{COEX_CU_RSRVD1_RP, COEX_CU_RSRVD1_WP, 0, COEX_RSRVD1_FLAGS},

	{COEX_CU_RSRVD2_RP, COEX_CU_RSRVD2_WP, 0, COEX_RSRVD2_FLAGS}

};



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

 *

 * uCode download functions
@@ -215,25 +184,9 @@ static int iwl_send_wimax_coex(struct iwl_priv *priv) 
{

	struct iwl_wimax_coex_cmd coex_cmd;



	if (cfg(priv)->base_params->support_wimax_coexist) {

		/* UnMask wake up src at associated sleep */

		coex_cmd.flags = COEX_FLAGS_ASSOC_WA_UNMASK_MSK;



		/* UnMask wake up src at unassociated sleep */

		coex_cmd.flags |= COEX_FLAGS_UNASSOC_WA_UNMASK_MSK;

		memcpy(coex_cmd.sta_prio, cu_priorities,

			sizeof(struct iwl_wimax_coex_event_entry) *

			 COEX_NUM_OF_EVENTS);



		/* enabling the coexistence feature */

		coex_cmd.flags |= COEX_FLAGS_COEX_ENABLE_MSK;



		/* enabling the priorities tables */

		coex_cmd.flags |= COEX_FLAGS_STA_TABLE_VALID_MSK;

	} else {

	/* coexistence is disabled */

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

	}



	return iwl_dvm_send_cmd_pdu(priv,

				COEX_PRIORITY_TABLE_CMD, CMD_SYNC,

				sizeof(coex_cmd), &coex_cmd);