aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-05-28 07:08:30 -0400
committerReinette Chatre <reinette.chatre@intel.com>2010-06-14 13:59:08 -0400
commitf4989d9befbeeaa2c070fc251edd75e8ffc6deef (patch)
tree71a7e8f7c32d770588d83a18c7ff60356f2f9b14 /drivers/net/wireless/iwlwifi/iwl-agn.c
parent832c10fd733893f86c63bde1c65b005d5a2fe346 (diff)
iwlwifi: trace full RX
The length contained in the status word doesn't include the status word's length itself, so we need to account for that for tracing. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 69e17d782883..ce88bc0aa520 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -941,6 +941,8 @@ void iwl_rx_handle(struct iwl_priv *priv)
941 fill_rx = 1; 941 fill_rx = 1;
942 942
943 while (i != r) { 943 while (i != r) {
944 int len;
945
944 rxb = rxq->queue[i]; 946 rxb = rxq->queue[i];
945 947
946 /* If an RXB doesn't have a Rx queue slot associated with it, 948 /* If an RXB doesn't have a Rx queue slot associated with it,
@@ -955,8 +957,9 @@ void iwl_rx_handle(struct iwl_priv *priv)
955 PCI_DMA_FROMDEVICE); 957 PCI_DMA_FROMDEVICE);
956 pkt = rxb_addr(rxb); 958 pkt = rxb_addr(rxb);
957 959
958 trace_iwlwifi_dev_rx(priv, pkt, 960 len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;
959 le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK); 961 len += sizeof(u32); /* account for status word */
962 trace_iwlwifi_dev_rx(priv, pkt, len);
960 963
961 /* Reclaim a command buffer only if this packet is a response 964 /* Reclaim a command buffer only if this packet is a response
962 * to a (driver-originated) command. 965 * to a (driver-originated) command.