diff options
author | Johannes Berg <johannes.berg@intel.com> | 2011-05-04 10:50:38 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-05-13 13:31:52 -0400 |
commit | 3fa507386dc4cdf731344cb9361e9cca373cedb9 (patch) | |
tree | 3368a5e3f9dcb39039aafeab25165091c62c5f5b /drivers/net/wireless/iwlwifi/iwl-agn-lib.c | |
parent | 6b86bd62a505a4a9739474f00f8088395b7a80ba (diff) |
iwlagn: prepare for multi-TB commands
In a subsequent patch, I want to make commands use
multiple TBs in a TFD. This is a simple change to
prepare the data structures for this, with as of
now still just a single TB supported.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-lib.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c index 8e79653aed9a..576f45e9ab9f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c | |||
@@ -1140,7 +1140,7 @@ int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) | |||
1140 | { | 1140 | { |
1141 | struct iwl_host_cmd cmd = { | 1141 | struct iwl_host_cmd cmd = { |
1142 | .id = REPLY_SCAN_CMD, | 1142 | .id = REPLY_SCAN_CMD, |
1143 | .len = sizeof(struct iwl_scan_cmd), | 1143 | .len = { sizeof(struct iwl_scan_cmd), }, |
1144 | .flags = CMD_SIZE_HUGE, | 1144 | .flags = CMD_SIZE_HUGE, |
1145 | }; | 1145 | }; |
1146 | struct iwl_scan_cmd *scan; | 1146 | struct iwl_scan_cmd *scan; |
@@ -1425,10 +1425,10 @@ int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) | |||
1425 | return -EIO; | 1425 | return -EIO; |
1426 | } | 1426 | } |
1427 | 1427 | ||
1428 | cmd.len += le16_to_cpu(scan->tx_cmd.len) + | 1428 | cmd.len[0] += le16_to_cpu(scan->tx_cmd.len) + |
1429 | scan->channel_count * sizeof(struct iwl_scan_channel); | 1429 | scan->channel_count * sizeof(struct iwl_scan_channel); |
1430 | cmd.data = scan; | 1430 | cmd.data[0] = scan; |
1431 | scan->len = cpu_to_le16(cmd.len); | 1431 | scan->len = cpu_to_le16(cmd.len[0]); |
1432 | 1432 | ||
1433 | /* set scan bit here for PAN params */ | 1433 | /* set scan bit here for PAN params */ |
1434 | set_bit(STATUS_SCAN_HW, &priv->status); | 1434 | set_bit(STATUS_SCAN_HW, &priv->status); |
@@ -1520,9 +1520,9 @@ int iwlagn_txfifo_flush(struct iwl_priv *priv, u16 flush_control) | |||
1520 | struct iwl_txfifo_flush_cmd flush_cmd; | 1520 | struct iwl_txfifo_flush_cmd flush_cmd; |
1521 | struct iwl_host_cmd cmd = { | 1521 | struct iwl_host_cmd cmd = { |
1522 | .id = REPLY_TXFIFO_FLUSH, | 1522 | .id = REPLY_TXFIFO_FLUSH, |
1523 | .len = sizeof(struct iwl_txfifo_flush_cmd), | 1523 | .len = { sizeof(struct iwl_txfifo_flush_cmd), }, |
1524 | .flags = CMD_SYNC, | 1524 | .flags = CMD_SYNC, |
1525 | .data = &flush_cmd, | 1525 | .data = { &flush_cmd, }, |
1526 | }; | 1526 | }; |
1527 | 1527 | ||
1528 | might_sleep(); | 1528 | might_sleep(); |