From: Ivo van Doorn <ivdoorn@gmail.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com
Subject: [PATCH 04/06] rt2x00: Use unlikely for error case in rt2x00queue_write_tx_frame
Date: Sat, 9 Oct 2010 13:34:43 +0200 [thread overview]
Message-ID: <201010091334.44618.IvDoorn@gmail.com> (raw)
In-Reply-To: <201010091334.12741.IvDoorn@gmail.com>
From: Helmut Schaa <helmut.schaa@googlemail.com>
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>
---
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 4436ff7..83630f1 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",
--
1.7.2.3
next prev parent reply other threads:[~2010-10-09 11:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-09 11:33 [PATCH 01/06] rt2x00: Shortcut link state updates when not operating as STA Ivo van Doorn
2010-10-09 11:33 ` [PATCH 02/06] rt2x00: Optimize unmapping of skbs Ivo van Doorn
2010-10-09 11:34 ` [PATCH 03/06] rt2x00: Use proper type for rxwi_w2 in rt2800_agc_to_rssi Ivo van Doorn
2010-10-09 11:34 ` Ivo van Doorn [this message]
2010-10-09 11:35 ` [PATCH 05/06] rt2x00: Remove superfluous initialization of qidx Ivo van Doorn
2010-10-09 11:35 ` [PATCH 06/06] rt2x00: Fix tx status handling in rt2800pci Ivo van Doorn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201010091334.44618.IvDoorn@gmail.com \
--to=ivdoorn@gmail.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=users@rt2x00.serialmonkey.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.