diff options
| author | Emmanuel Grumbach | 2011-06-21 20:03:01 +0200 |
|---|---|---|
| committer | Wey-Yi Guy | 2011-06-24 20:20:38 +0200 |
| commit | 77e569edf5a33cd94dac67c714cf736675b0e2da (patch) | |
| tree | dbdba768f14306e69f6e4d02c7fc98b6798fbc1e /drivers/net | |
| parent | mwl8k: Tell firmware to generate CCMP header (diff) | |
| download | kernel-qcow2-linux-77e569edf5a33cd94dac67c714cf736675b0e2da.tar.gz kernel-qcow2-linux-77e569edf5a33cd94dac67c714cf736675b0e2da.tar.xz kernel-qcow2-linux-77e569edf5a33cd94dac67c714cf736675b0e2da.zip | |
iwlagn: Fix a bug introduced by the HUGE command removal
Since we don't have HUGE command any more, there is no point in adding 1
to the num of slots in the command queue. Doing so is buggy and might corrupt
memory.
Bug introduced by 4ce7cc2b09553a91d4aea014c39674685715173a
iwlagn: support multiple TBs per command
Cc: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-tx.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c index 686e176b5ebd..157a642a5436 100644 --- a/drivers/net/wireless/iwlwifi/iwl-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c @@ -535,12 +535,7 @@ out_free_arrays: void iwl_tx_queue_reset(struct iwl_priv *priv, struct iwl_tx_queue *txq, int slots_num, u32 txq_id) { - int actual_slots = slots_num; - - if (txq_id == priv->cmd_queue) - actual_slots++; - - memset(txq->meta, 0, sizeof(struct iwl_cmd_meta) * actual_slots); + memset(txq->meta, 0, sizeof(struct iwl_cmd_meta) * slots_num); txq->need_update = 0; |