Skip to content

Commit

Permalink
iwl4965: make iwl4965_send_rxon_assoc asynchronous
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Reinette Chatre authored and John W. Linville committed Apr 16, 2008
1 parent e2a722e commit 51dbfd1
Showing 1 changed file with 6 additions and 21 deletions.
27 changes: 6 additions & 21 deletions drivers/net/wireless/iwlwifi/iwl4965-base.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
}

/**
Expand Down

0 comments on commit 51dbfd1

Please sign in to comment.