diff options
| author | Helmut Schaa <helmut.schaa@googlemail.com> | 2011-03-03 19:40:33 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-03-04 14:06:47 -0500 |
| commit | 5356d963304638735b4b53dfbded7a1c4ae0818d (patch) | |
| tree | 2ad65243ee2dec57ca418facff48555ebd5d32c9 /drivers/net/wireless/rt2x00/rt2800lib.c | |
| parent | c262e08b79204f57aba1f180d6ebdb5ea9db01dd (diff) | |
| download | kernel_samsung_smdk4412-5356d963304638735b4b53dfbded7a1c4ae0818d.zip kernel_samsung_smdk4412-5356d963304638735b4b53dfbded7a1c4ae0818d.tar.gz kernel_samsung_smdk4412-5356d963304638735b4b53dfbded7a1c4ae0818d.tar.bz2 | |
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>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2800lib.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2800lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 76ced6d..ad90c86 100644 --- 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; } |