Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4989d9b authored by Johannes Berg's avatar Johannes Berg Committed by Reinette Chatre
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent 832c10fd

drivers/net/wireless/iwlwifi/iwl-agn.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -941,6 +941,8 @@ void iwl_rx_handle(struct iwl_priv *priv) 
		fill_rx = 1;

		fill_rx = 1;





	while (i != r) {

	while (i != r) {

		int len;



		rxb = rxq->queue[i];

		rxb = rxq->queue[i];





		/* If an RXB doesn't have a Rx queue slot associated with it,

		/* 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) 
			       PCI_DMA_FROMDEVICE);

			       PCI_DMA_FROMDEVICE);

		pkt = rxb_addr(rxb);

		pkt = rxb_addr(rxb);





		trace_iwlwifi_dev_rx(priv, pkt,

		len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;

			le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK);

		len += sizeof(u32); /* account for status word */

		trace_iwlwifi_dev_rx(priv, pkt, len);





		/* Reclaim a command buffer only if this packet is a response

		/* Reclaim a command buffer only if this packet is a response

		 *   to a (driver-originated) command.

		 *   to a (driver-originated) command.

drivers/net/wireless/iwlwifi/iwl3945-base.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -1252,6 +1252,8 @@ static void iwl3945_rx_handle(struct iwl_priv *priv) 
		IWL_DEBUG_RX(priv, "r = %d, i = %d\n", r, i);

		IWL_DEBUG_RX(priv, "r = %d, i = %d\n", r, i);





	while (i != r) {

	while (i != r) {

		int len;



		rxb = rxq->queue[i];

		rxb = rxq->queue[i];





		/* If an RXB doesn't have a Rx queue slot associated with it,

		/* If an RXB doesn't have a Rx queue slot associated with it,
@@ -1266,8 +1268,9 @@ static void iwl3945_rx_handle(struct iwl_priv *priv) 
			       PCI_DMA_FROMDEVICE);

			       PCI_DMA_FROMDEVICE);

		pkt = rxb_addr(rxb);

		pkt = rxb_addr(rxb);





		trace_iwlwifi_dev_rx(priv, pkt,

		len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;

			le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK);

		len += sizeof(u32); /* account for status word */

		trace_iwlwifi_dev_rx(priv, pkt, len);





		/* Reclaim a command buffer only if this packet is a response

		/* Reclaim a command buffer only if this packet is a response

		 *   to a (driver-originated) command.

		 *   to a (driver-originated) command.