diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-tx.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-tx.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c index 288b871e974b..9b76bd41f214 100644 --- a/drivers/net/wireless/iwlwifi/iwl-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c | |||
@@ -668,14 +668,6 @@ static void iwl_tx_cmd_build_hwcrypto(struct iwl_priv *priv, | |||
668 | } | 668 | } |
669 | } | 669 | } |
670 | 670 | ||
671 | static void iwl_update_tx_stats(struct iwl_priv *priv, u16 fc, u16 len) | ||
672 | { | ||
673 | /* 0 - mgmt, 1 - cnt, 2 - data */ | ||
674 | int idx = (fc & IEEE80211_FCTL_FTYPE) >> 2; | ||
675 | priv->tx_stats[idx].cnt++; | ||
676 | priv->tx_stats[idx].bytes += len; | ||
677 | } | ||
678 | |||
679 | /* | 671 | /* |
680 | * start REPLY_TX command process | 672 | * start REPLY_TX command process |
681 | */ | 673 | */ |
@@ -808,12 +800,12 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) | |||
808 | 800 | ||
809 | /* TODO need this for burst mode later on */ | 801 | /* TODO need this for burst mode later on */ |
810 | iwl_tx_cmd_build_basic(priv, tx_cmd, info, hdr, sta_id); | 802 | iwl_tx_cmd_build_basic(priv, tx_cmd, info, hdr, sta_id); |
803 | iwl_dbg_log_tx_data_frame(priv, len, hdr); | ||
811 | 804 | ||
812 | /* set is_hcca to 0; it probably will never be implemented */ | 805 | /* set is_hcca to 0; it probably will never be implemented */ |
813 | iwl_tx_cmd_build_rate(priv, tx_cmd, info, fc, sta_id, 0); | 806 | iwl_tx_cmd_build_rate(priv, tx_cmd, info, fc, sta_id, 0); |
814 | 807 | ||
815 | iwl_update_tx_stats(priv, le16_to_cpu(fc), len); | 808 | iwl_update_stats(priv, true, fc, len); |
816 | |||
817 | /* | 809 | /* |
818 | * Use the first empty entry in this queue's command buffer array | 810 | * Use the first empty entry in this queue's command buffer array |
819 | * to contain the Tx command and MAC header concatenated together | 811 | * to contain the Tx command and MAC header concatenated together |
@@ -884,8 +876,8 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) | |||
884 | IWL_DEBUG_TX(priv, "sequence nr = 0X%x \n", | 876 | IWL_DEBUG_TX(priv, "sequence nr = 0X%x \n", |
885 | le16_to_cpu(out_cmd->hdr.sequence)); | 877 | le16_to_cpu(out_cmd->hdr.sequence)); |
886 | IWL_DEBUG_TX(priv, "tx_flags = 0X%x \n", le32_to_cpu(tx_cmd->tx_flags)); | 878 | IWL_DEBUG_TX(priv, "tx_flags = 0X%x \n", le32_to_cpu(tx_cmd->tx_flags)); |
887 | iwl_print_hex_dump(IWL_DL_TX, (u8 *)tx_cmd, sizeof(*tx_cmd)); | 879 | iwl_print_hex_dump(priv, IWL_DL_TX, (u8 *)tx_cmd, sizeof(*tx_cmd)); |
888 | iwl_print_hex_dump(IWL_DL_TX, (u8 *)tx_cmd->hdr, hdr_len); | 880 | iwl_print_hex_dump(priv, IWL_DL_TX, (u8 *)tx_cmd->hdr, hdr_len); |
889 | 881 | ||
890 | /* Set up entry for this TFD in Tx byte-count array */ | 882 | /* Set up entry for this TFD in Tx byte-count array */ |
891 | if (info->flags & IEEE80211_TX_CTL_AMPDU) | 883 | if (info->flags & IEEE80211_TX_CTL_AMPDU) |