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 <[email protected]>
Signed-off-by: Ivo van Doorn <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 76ced6dcee052e514c2781434f85c39ecbc7aa1e..ad90c86810d777447d039555bbca8785d94a04cc 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -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;
        }