Commit 5356d963 authored Mar 03, 2011 by Helmut Schaa Committed by John W. Linville Mar 04, 2011

rt2x00: Add unlikely macro to special case tx status handling



This special case shouldn't happen very often. Only if a frame that
is not intended to be aggregated ends up in an AMPDU _and_ was intended
to be sent at a different MCS rate as the aggregate. Hence, using
unlikely is justified.

Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent c262e08b

drivers/net/wireless/rt2x00/rt2800lib.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -681,7 +681,7 @@ void rt2800_txdone_entry(struct queue_entry *entry, u32 status)
		* confuse the rate control algortihm by providing clearly wrong
		* data.
		*/
		if (aggr == 1 && ampdu == 0 && real_mcs != mcs) {
		if (unlikely(aggr == 1 && ampdu == 0 && real_mcs != mcs)) {
		skbdesc->tx_rate_idx = real_mcs;
		mcs = real_mcs;
		}