diff options
author | Ron Rindjunsky <ron.rindjunsky@intel.com> | 2008-05-15 01:54:14 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-05-21 21:48:05 -0400 |
commit | 9636e583d2c641f8cb32d0681f5052b2885edd79 (patch) | |
tree | 07b9eabffc5ddfa2a1882413504daafef0fc2c84 /drivers/net/wireless/iwlwifi/iwl-5000.c | |
parent | 99da1b48fc77484aa8da85a45d9c3c1e00243659 (diff) |
iwlwifi: iwl5000 WiFi/WiMax coexistence
This patch adds WiFi/WiMax coexistence to iwl5000.
Signed-off-by: Ron Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-5000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index 5e818eedb0ec..520c7eaf1b0d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
@@ -494,6 +494,16 @@ static void iwl5000_tx_queue_set_status(struct iwl_priv *priv, | |||
494 | scd_retry ? "BA" : "AC", txq_id, tx_fifo_id); | 494 | scd_retry ? "BA" : "AC", txq_id, tx_fifo_id); |
495 | } | 495 | } |
496 | 496 | ||
497 | static int iwl5000_send_wimax_coex(struct iwl_priv *priv) | ||
498 | { | ||
499 | struct iwl_wimax_coex_cmd coex_cmd; | ||
500 | |||
501 | memset(&coex_cmd, 0, sizeof(coex_cmd)); | ||
502 | |||
503 | return iwl_send_cmd_pdu(priv, COEX_PRIORITY_TABLE_CMD, | ||
504 | sizeof(coex_cmd), &coex_cmd); | ||
505 | } | ||
506 | |||
497 | static int iwl5000_alive_notify(struct iwl_priv *priv) | 507 | static int iwl5000_alive_notify(struct iwl_priv *priv) |
498 | { | 508 | { |
499 | u32 a; | 509 | u32 a; |
@@ -568,6 +578,8 @@ static int iwl5000_alive_notify(struct iwl_priv *priv) | |||
568 | iwl_release_nic_access(priv); | 578 | iwl_release_nic_access(priv); |
569 | spin_unlock_irqrestore(&priv->lock, flags); | 579 | spin_unlock_irqrestore(&priv->lock, flags); |
570 | 580 | ||
581 | iwl5000_send_wimax_coex(priv); | ||
582 | |||
571 | /* Ask for statistics now, the uCode will send notification | 583 | /* Ask for statistics now, the uCode will send notification |
572 | * periodically after association */ | 584 | * periodically after association */ |
573 | iwl_send_statistics_request(priv, CMD_ASYNC); | 585 | iwl_send_statistics_request(priv, CMD_ASYNC); |