diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2011-07-08 11:46:14 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-07-11 15:02:03 -0400 |
commit | e419d62d72b23392e7f9a5da047fb17d70edc54a (patch) | |
tree | 6b6608a26d9cb88f176b530e85d3e8b607927856 /drivers/net/wireless/iwlwifi/iwl-scan.c | |
parent | 06f491ef4b659fa6f6850f31d05a4a03db0d9d96 (diff) |
iwlagn: consolidate the API that sends host commands and move to transport
Now, there are only two functions to send a host command:
* send_cmd that receives a iwl_host_cmd
* send_cmd_pdu that builds the iwl_host_cmd itself and received flags
The flags CMD_ASYNC / CMD_SYNC / CMD_WANT_SKB are not changed by the API
functions.
Kill the unused flags CMD_SIZE_NORMAL / CMD_NO_SKB on the way.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@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/iwlwifi/iwl-scan.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-scan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index 438eecd87335..4c809bf9aacc 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c | |||
@@ -61,7 +61,7 @@ static int iwl_send_scan_abort(struct iwl_priv *priv) | |||
61 | struct iwl_rx_packet *pkt; | 61 | struct iwl_rx_packet *pkt; |
62 | struct iwl_host_cmd cmd = { | 62 | struct iwl_host_cmd cmd = { |
63 | .id = REPLY_SCAN_ABORT_CMD, | 63 | .id = REPLY_SCAN_ABORT_CMD, |
64 | .flags = CMD_WANT_SKB, | 64 | .flags = CMD_SYNC | CMD_WANT_SKB, |
65 | }; | 65 | }; |
66 | 66 | ||
67 | /* Exit instantly with error when device is not ready | 67 | /* Exit instantly with error when device is not ready |
@@ -74,7 +74,7 @@ static int iwl_send_scan_abort(struct iwl_priv *priv) | |||
74 | test_bit(STATUS_EXIT_PENDING, &priv->status)) | 74 | test_bit(STATUS_EXIT_PENDING, &priv->status)) |
75 | return -EIO; | 75 | return -EIO; |
76 | 76 | ||
77 | ret = iwl_send_cmd_sync(priv, &cmd); | 77 | ret = priv->trans.ops->send_cmd(priv, &cmd); |
78 | if (ret) | 78 | if (ret) |
79 | return ret; | 79 | return ret; |
80 | 80 | ||