diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-03-15 16:26:48 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-04-09 16:37:19 -0400 |
commit | 85560af37a5256d48089e04afc5ff4241579ab3e (patch) | |
tree | deb6aebb6820970ae0f40a6966d2ab81d9213fe8 /drivers/net/wireless | |
parent | d9df23e930cb29a760c227c443ac36205eb55f58 (diff) |
iwlwifi: remove support_wimax_coexist
There's no device using this mechanism.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-shared.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-ucode.c | 51 |
2 files changed, 2 insertions, 51 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h index 94b16ccddebc..18ef286539b9 100644 --- a/drivers/net/wireless/iwlwifi/iwl-shared.h +++ b/drivers/net/wireless/iwlwifi/iwl-shared.h | |||
@@ -217,7 +217,6 @@ enum iwl_led_mode { | |||
217 | * @chain_noise_num_beacons: number of beacons used to compute chain noise | 217 | * @chain_noise_num_beacons: number of beacons used to compute chain noise |
218 | * @adv_thermal_throttle: support advance thermal throttle | 218 | * @adv_thermal_throttle: support advance thermal throttle |
219 | * @support_ct_kill_exit: support ct kill exit condition | 219 | * @support_ct_kill_exit: support ct kill exit condition |
220 | * @support_wimax_coexist: support wimax/wifi co-exist | ||
221 | * @plcp_delta_threshold: plcp error rate threshold used to trigger | 220 | * @plcp_delta_threshold: plcp error rate threshold used to trigger |
222 | * radio tuning when there is a high receiving plcp error rate | 221 | * radio tuning when there is a high receiving plcp error rate |
223 | * @chain_noise_scale: default chain noise scale used for gain computation | 222 | * @chain_noise_scale: default chain noise scale used for gain computation |
@@ -240,7 +239,6 @@ struct iwl_base_params { | |||
240 | u16 led_compensation; | 239 | u16 led_compensation; |
241 | bool adv_thermal_throttle; | 240 | bool adv_thermal_throttle; |
242 | bool support_ct_kill_exit; | 241 | bool support_ct_kill_exit; |
243 | const bool support_wimax_coexist; | ||
244 | u8 plcp_delta_threshold; | 242 | u8 plcp_delta_threshold; |
245 | s32 chain_noise_scale; | 243 | s32 chain_noise_scale; |
246 | unsigned int wd_timeout; | 244 | unsigned int wd_timeout; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-ucode.c b/drivers/net/wireless/iwlwifi/iwl-ucode.c index a5b218959347..f23b2830b87d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-ucode.c +++ b/drivers/net/wireless/iwlwifi/iwl-ucode.c | |||
@@ -40,37 +40,6 @@ | |||
40 | #include "iwl-fh.h" | 40 | #include "iwl-fh.h" |
41 | #include "iwl-op-mode.h" | 41 | #include "iwl-op-mode.h" |
42 | 42 | ||
43 | static struct iwl_wimax_coex_event_entry cu_priorities[COEX_NUM_OF_EVENTS] = { | ||
44 | {COEX_CU_UNASSOC_IDLE_RP, COEX_CU_UNASSOC_IDLE_WP, | ||
45 | 0, COEX_UNASSOC_IDLE_FLAGS}, | ||
46 | {COEX_CU_UNASSOC_MANUAL_SCAN_RP, COEX_CU_UNASSOC_MANUAL_SCAN_WP, | ||
47 | 0, COEX_UNASSOC_MANUAL_SCAN_FLAGS}, | ||
48 | {COEX_CU_UNASSOC_AUTO_SCAN_RP, COEX_CU_UNASSOC_AUTO_SCAN_WP, | ||
49 | 0, COEX_UNASSOC_AUTO_SCAN_FLAGS}, | ||
50 | {COEX_CU_CALIBRATION_RP, COEX_CU_CALIBRATION_WP, | ||
51 | 0, COEX_CALIBRATION_FLAGS}, | ||
52 | {COEX_CU_PERIODIC_CALIBRATION_RP, COEX_CU_PERIODIC_CALIBRATION_WP, | ||
53 | 0, COEX_PERIODIC_CALIBRATION_FLAGS}, | ||
54 | {COEX_CU_CONNECTION_ESTAB_RP, COEX_CU_CONNECTION_ESTAB_WP, | ||
55 | 0, COEX_CONNECTION_ESTAB_FLAGS}, | ||
56 | {COEX_CU_ASSOCIATED_IDLE_RP, COEX_CU_ASSOCIATED_IDLE_WP, | ||
57 | 0, COEX_ASSOCIATED_IDLE_FLAGS}, | ||
58 | {COEX_CU_ASSOC_MANUAL_SCAN_RP, COEX_CU_ASSOC_MANUAL_SCAN_WP, | ||
59 | 0, COEX_ASSOC_MANUAL_SCAN_FLAGS}, | ||
60 | {COEX_CU_ASSOC_AUTO_SCAN_RP, COEX_CU_ASSOC_AUTO_SCAN_WP, | ||
61 | 0, COEX_ASSOC_AUTO_SCAN_FLAGS}, | ||
62 | {COEX_CU_ASSOC_ACTIVE_LEVEL_RP, COEX_CU_ASSOC_ACTIVE_LEVEL_WP, | ||
63 | 0, COEX_ASSOC_ACTIVE_LEVEL_FLAGS}, | ||
64 | {COEX_CU_RF_ON_RP, COEX_CU_RF_ON_WP, 0, COEX_CU_RF_ON_FLAGS}, | ||
65 | {COEX_CU_RF_OFF_RP, COEX_CU_RF_OFF_WP, 0, COEX_RF_OFF_FLAGS}, | ||
66 | {COEX_CU_STAND_ALONE_DEBUG_RP, COEX_CU_STAND_ALONE_DEBUG_WP, | ||
67 | 0, COEX_STAND_ALONE_DEBUG_FLAGS}, | ||
68 | {COEX_CU_IPAN_ASSOC_LEVEL_RP, COEX_CU_IPAN_ASSOC_LEVEL_WP, | ||
69 | 0, COEX_IPAN_ASSOC_LEVEL_FLAGS}, | ||
70 | {COEX_CU_RSRVD1_RP, COEX_CU_RSRVD1_WP, 0, COEX_RSRVD1_FLAGS}, | ||
71 | {COEX_CU_RSRVD2_RP, COEX_CU_RSRVD2_WP, 0, COEX_RSRVD2_FLAGS} | ||
72 | }; | ||
73 | |||
74 | /****************************************************************************** | 43 | /****************************************************************************** |
75 | * | 44 | * |
76 | * uCode download functions | 45 | * uCode download functions |
@@ -215,25 +184,9 @@ static int iwl_send_wimax_coex(struct iwl_priv *priv) | |||
215 | { | 184 | { |
216 | struct iwl_wimax_coex_cmd coex_cmd; | 185 | struct iwl_wimax_coex_cmd coex_cmd; |
217 | 186 | ||
218 | if (cfg(priv)->base_params->support_wimax_coexist) { | 187 | /* coexistence is disabled */ |
219 | /* UnMask wake up src at associated sleep */ | 188 | memset(&coex_cmd, 0, sizeof(coex_cmd)); |
220 | coex_cmd.flags = COEX_FLAGS_ASSOC_WA_UNMASK_MSK; | ||
221 | |||
222 | /* UnMask wake up src at unassociated sleep */ | ||
223 | coex_cmd.flags |= COEX_FLAGS_UNASSOC_WA_UNMASK_MSK; | ||
224 | memcpy(coex_cmd.sta_prio, cu_priorities, | ||
225 | sizeof(struct iwl_wimax_coex_event_entry) * | ||
226 | COEX_NUM_OF_EVENTS); | ||
227 | 189 | ||
228 | /* enabling the coexistence feature */ | ||
229 | coex_cmd.flags |= COEX_FLAGS_COEX_ENABLE_MSK; | ||
230 | |||
231 | /* enabling the priorities tables */ | ||
232 | coex_cmd.flags |= COEX_FLAGS_STA_TABLE_VALID_MSK; | ||
233 | } else { | ||
234 | /* coexistence is disabled */ | ||
235 | memset(&coex_cmd, 0, sizeof(coex_cmd)); | ||
236 | } | ||
237 | return iwl_dvm_send_cmd_pdu(priv, | 190 | return iwl_dvm_send_cmd_pdu(priv, |
238 | COEX_PRIORITY_TABLE_CMD, CMD_SYNC, | 191 | COEX_PRIORITY_TABLE_CMD, CMD_SYNC, |
239 | sizeof(coex_cmd), &coex_cmd); | 192 | sizeof(coex_cmd), &coex_cmd); |