diff options
author | Reinette Chatre <reinette.chatre@intel.com> | 2009-07-09 10:33:39 -0700 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-07-21 12:07:33 -0400 |
commit | 7b80ece41aea0b73283c6df5a8f25d40aa13135d (patch) | |
tree | 21e7b28f260bd0fc63d8c3d5b82bab3976da5160 /drivers/net | |
parent | 872ed1902f511a8947021c562f5728a5bf0640b5 (diff) | |
download | kernel-crypto-7b80ece41aea0b73283c6df5a8f25d40aa13135d.tar.gz kernel-crypto-7b80ece41aea0b73283c6df5a8f25d40aa13135d.tar.xz kernel-crypto-7b80ece41aea0b73283c6df5a8f25d40aa13135d.zip |
iwlwifi: only update byte count table during aggregation
The byte count table is only used for aggregation. Updating it
in other cases caused fragmented frames to be dropped.
This fixes http://www.intellinuxwireless.org/bugzilla/show_bug.cgi?id=2004
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-tx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c index 85ae7a62109..9bbeec9427f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c @@ -872,7 +872,8 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) iwl_print_hex_dump(priv, IWL_DL_TX, (u8 *)tx_cmd->hdr, hdr_len); /* Set up entry for this TFD in Tx byte-count array */ - priv->cfg->ops->lib->txq_update_byte_cnt_tbl(priv, txq, + if (info->flags & IEEE80211_TX_CTL_AMPDU) + priv->cfg->ops->lib->txq_update_byte_cnt_tbl(priv, txq, le16_to_cpu(tx_cmd->len)); pci_dma_sync_single_for_device(priv->pci_dev, txcmd_phys, |