]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
rt2x00: Make use of unlikely during tx status processing
authorHelmut Schaa <helmut.schaa@googlemail.com>
Thu, 3 Mar 2011 18:39:27 +0000 (19:39 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 4 Mar 2011 19:06:46 +0000 (14:06 -0500)
These conditions are unlikely to happen, tell the compiler.

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>
drivers/net/wireless/rt2x00/rt2800pci.c

index 5b53d005559bf2312df97a9a4b975b4252d1b28c..046a7b7d1241f434085929ff7fa23653963352d9 100644 (file)
@@ -726,7 +726,7 @@ static void rt2800pci_txdone(struct rt2x00_dev *rt2x00dev)
 
        while (kfifo_get(&rt2x00dev->txstatus_fifo, &status)) {
                qid = rt2x00_get_field32(status, TX_STA_FIFO_PID_QUEUE);
-               if (qid >= QID_RX) {
+               if (unlikely(qid >= QID_RX)) {
                        /*
                         * Unknown queue, this shouldn't happen. Just drop
                         * this tx status.
@@ -747,7 +747,7 @@ static void rt2800pci_txdone(struct rt2x00_dev *rt2x00dev)
                        break;
                }
 
-               if (rt2x00queue_empty(queue)) {
+               if (unlikely(rt2x00queue_empty(queue))) {
                        /*
                         * The queue is empty. Stop processing here
                         * and drop the tx status.