net: ipa: simplify TX completion statistics

When a TX request is issued, its channel's accumulated byte and
transaction counts are recorded.  This currently does *not* take
into account the transaction being committed.

Later, when the transaction completes, the number of bytes and
transactions that have completed since the transaction was committed
are reported to the network stack.  The transaction and its byte
count are accounted for at that time.

Instead, record the transaction and its bytes in the counts recorded
at commit time.  This avoids the need to do so when the transaction
completes, and provides a (small) simplification of that code.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c
index 1091ac23567d588637d30ec3df77e6abb5e31b4e..4f8187c54382491fbde934f21df81d5bc76d90f6 100644 (file)
--- a/drivers/net/ipa/gsi.c
+++ b/drivers/net/ipa/gsi.c
@@ -995,11 +995,11 @@ void gsi_trans_tx_committed(struct gsi_trans *trans)
 {
        struct gsi_channel *channel = &trans->gsi->channel[trans->channel_id];
 
-       trans->trans_count = channel->trans_count;
-       trans->byte_count = channel->byte_count;
-
        channel->trans_count++;
        channel->byte_count += trans->len;
+
+       trans->trans_count = channel->trans_count;
+       trans->byte_count = channel->byte_count;
 }
 
 void gsi_trans_tx_queued(struct gsi_trans *trans)
@@ -1047,13 +1047,11 @@ void gsi_trans_tx_queued(struct gsi_trans *trans)
 static void
 gsi_channel_tx_update(struct gsi_channel *channel, struct gsi_trans *trans)
 {
-       u64 byte_count = trans->byte_count + trans->len;
-       u64 trans_count = trans->trans_count + 1;
+       u64 trans_count = trans->trans_count - channel->compl_trans_count;
+       u64 byte_count = trans->byte_count - channel->compl_byte_count;
 
-       byte_count -= channel->compl_byte_count;
-       channel->compl_byte_count += byte_count;
-       trans_count -= channel->compl_trans_count;
        channel->compl_trans_count += trans_count;
+       channel->compl_byte_count += byte_count;
 
        ipa_gsi_channel_tx_completed(channel->gsi, gsi_channel_id(channel),
                                     trans_count, byte_count);