diff options
| author | Reinette Chatre <reinette.chatre@intel.com> | 2008-04-14 21:16:11 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-04-16 15:59:59 -0400 |
| commit | 51dbfd1d59b0f55aef2105e06f770f3a97fc4e3a (patch) | |
| tree | 5a274668c8cfc1533df26df69d85ac579c540c36 | |
| parent | e2a722eba1b3aa504ae177353d100287398881c3 (diff) | |
iwl4965: make iwl4965_send_rxon_assoc asynchronous
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Acked-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index 60c0b8375f2..9fb985770fd 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c @@ -758,15 +758,8 @@ static int iwl4965_full_rxon_required(struct iwl_priv *priv) static int iwl4965_send_rxon_assoc(struct iwl_priv *priv) { - int rc = 0; - struct iwl4965_rx_packet *res = NULL; + int ret = 0; struct iwl4965_rxon_assoc_cmd rxon_assoc; - struct iwl_host_cmd cmd = { - .id = REPLY_RXON_ASSOC, - .len = sizeof(rxon_assoc), - .meta.flags = CMD_WANT_SKB, - .data = &rxon_assoc, - }; const struct iwl4965_rxon_cmd *rxon1 = &priv->staging_rxon; const struct iwl4965_rxon_cmd *rxon2 = &priv->active_rxon; @@ -794,20 +787,12 @@ static int iwl4965_send_rxon_assoc(struct iwl_priv *priv) priv->staging_rxon.ofdm_ht_dual_stream_basic_rates; rxon_assoc.rx_chain_select_flags = priv->staging_rxon.rx_chain; - rc = iwl_send_cmd_sync(priv, &cmd); - if (rc) - return rc; - - res = (struct iwl4965_rx_packet *)cmd.meta.u.skb->data; - if (res->hdr.flags & IWL_CMD_FAILED_MSK) { - IWL_ERROR("Bad return from REPLY_RXON_ASSOC command\n"); - rc = -EIO; - } - - priv->alloc_rxb_skb--; - dev_kfree_skb_any(cmd.meta.u.skb); + ret = iwl_send_cmd_pdu_async(priv, REPLY_RXON_ASSOC, + sizeof(rxon_assoc), &rxon_assoc, NULL); + if (ret) + return ret; - return rc; + return ret; } /** |