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

Commit feff1f2f authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: take statistics before encryption 



When encryption is used, the number of bytes
sent to the peer increases by the IV and ICV.
This is accounted if software encryption is
used, but not if the devices does hardware
encryption. To make the numbers comparable,
never account for that overhead.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5e68ff65

net/mac80211/tx.c

+18 −18
Original line number Diff line number Diff line
@@ -843,6 +843,23 @@ ieee80211_tx_h_fragment(struct ieee80211_tx_data *tx) 
	return TX_CONTINUE;

}



static ieee80211_tx_result debug_noinline

ieee80211_tx_h_stats(struct ieee80211_tx_data *tx)

{

	struct sk_buff *skb = tx->skb;



	if (!tx->sta)

		return TX_CONTINUE;



	tx->sta->tx_packets++;

	do {

		tx->sta->tx_fragments++;

		tx->sta->tx_bytes += skb->len;

	} while ((skb = skb->next));



	return TX_CONTINUE;

}



static ieee80211_tx_result debug_noinline

ieee80211_tx_h_encrypt(struct ieee80211_tx_data *tx)

{
@@ -887,23 +904,6 @@ ieee80211_tx_h_calculate_duration(struct ieee80211_tx_data *tx) 
	return TX_CONTINUE;

}



static ieee80211_tx_result debug_noinline

ieee80211_tx_h_stats(struct ieee80211_tx_data *tx)

{

	struct sk_buff *skb = tx->skb;



	if (!tx->sta)

		return TX_CONTINUE;



	tx->sta->tx_packets++;

	do {

		tx->sta->tx_fragments++;

		tx->sta->tx_bytes += skb->len;

	} while ((skb = skb->next));



	return TX_CONTINUE;

}



/* actual transmit path */



/*
@@ -1213,9 +1213,9 @@ static int invoke_tx_handlers(struct ieee80211_tx_data *tx) 
	CALL_TXH(ieee80211_tx_h_sequence)

	CALL_TXH(ieee80211_tx_h_fragment)

	/* handlers after fragment must be aware of tx info fragmentation! */

	CALL_TXH(ieee80211_tx_h_stats)

	CALL_TXH(ieee80211_tx_h_encrypt)

	CALL_TXH(ieee80211_tx_h_calculate_duration)

	CALL_TXH(ieee80211_tx_h_stats)

#undef CALL_TXH



 txh_done: