diff options
| author |   Helmut Schaa <helmut.schaa@googlemail.com> | 2010-10-09 13:34:43 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2010-10-11 15:04:22 -0400 |
| commit | c6084d5fa2e70a436ab944066146de01819f5493 (patch) | |
| tree | 3c0d854e6f9795680c95c6faee1e4a54e5de404d /drivers/net/wireless/rt2x00/rt2x00queue.c | |
| parent | rt2x00: Use proper type for rxwi_w2 in rt2800_agc_to_rssi (diff) | |
| download | linux-dev-c6084d5fa2e70a436ab944066146de01819f5493.tar.xz linux-dev-c6084d5fa2e70a436ab944066146de01819f5493.zip | |
rt2x00: Use unlikely for error case in rt2x00queue_write_tx_frame
This is an error condition that is not supposed to happen. Hence, it is
safe to add unlikely to this check.
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/rt2x00queue.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00queue.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c index 4436ff72c864..83630f16dc64 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c @@ -489,7 +489,8 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb, if (unlikely(rt2x00queue_full(queue))) return -ENOBUFS; - if (test_and_set_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags)) { + if (unlikely(test_and_set_bit(ENTRY_OWNER_DEVICE_DATA, + &entry->flags))) { ERROR(queue->rt2x00dev, "Arrived at non-free entry in the non-full queue %d.\n" "Please file bug report to %s.\n", |