From patchwork Thu Mar 3 18:41:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivo van Doorn X-Patchwork-Id: 606931 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p23Imj2j021009 for ; Thu, 3 Mar 2011 18:49:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932182Ab1CCSs2 (ORCPT ); Thu, 3 Mar 2011 13:48:28 -0500 Received: from mail-wy0-f174.google.com ([74.125.82.174]:35605 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758687Ab1CCSs1 (ORCPT ); Thu, 3 Mar 2011 13:48:27 -0500 Received: by mail-wy0-f174.google.com with SMTP id 36so1356532wyg.19 for ; Thu, 03 Mar 2011 10:48:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:subject:date:user-agent:cc:references :in-reply-to:mime-version:content-type:content-transfer-encoding :message-id; bh=u8zUupSIh9J4/48/AiPYN5wsB0QO5l/z2QJGDYcWOTc=; b=WVhhP1/u/C7KLdGAX/7ItZ8BRbSMXg9wd4F1bZu66V7yhm5AafIT/Nzx/zA/qOKAo9 J3i+npxDBaKiZCCZebiveHu6xjQx0KuGATUS/J+tMJ/XiQgIvE7X8Bwe6XeVDt0bmhRF 7j6CX15FQcBQLP2d735wqIE2rFTGXld0GQ1NU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:references:in-reply-to :mime-version:content-type:content-transfer-encoding:message-id; b=KkK8IEFlPC1+lvksRjLCc/uoqNREmdA1vs07qvm/pfcR1J5n4Mhew7f+M0U5RPNe0/ aToNwI0+K05OOQT05nFtFGbtrXL0ySSESnCbxYgB6EGGuOcm019aMoCfTk8Y+/si+q18 +3Qls8ls+h9JDZ6VdB0AjA9mWf3J3LwsavD8U= Received: by 10.216.28.19 with SMTP id f19mr1160507wea.88.1299178107255; Thu, 03 Mar 2011 10:48:27 -0800 (PST) Received: from localhost.localdomain (g121037.upc-g.chello.nl [80.57.121.37]) by mx.google.com with ESMTPS id j49sm738659wer.14.2011.03.03.10.48.25 (version=SSLv3 cipher=OTHER); Thu, 03 Mar 2011 10:48:26 -0800 (PST) From: Ivo van Doorn To: "John W. Linville" Subject: [PATCH 05/19] rt2x00: Use unlikely for unexpected error condition in rt2x00_mac_tx Date: Thu, 3 Mar 2011 19:41:03 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.32.26-175.fc12.x86_64; KDE/4.4.5; x86_64; ; ) Cc: linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com References: <201103031938.56423.IvDoorn@gmail.com> <201103031939.57117.IvDoorn@gmail.com> <201103031940.34167.IvDoorn@gmail.com> In-Reply-To: <201103031940.34167.IvDoorn@gmail.com> MIME-Version: 1.0 Message-Id: <201103031941.04133.IvDoorn@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 03 Mar 2011 18:49:19 +0000 (UTC) diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c index 6715b77..9529d6f 100644 --- a/drivers/net/wireless/rt2x00/rt2x00mac.c +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c @@ -149,7 +149,7 @@ int rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) goto exit_fail; } - if (rt2x00queue_write_tx_frame(queue, skb, false)) + if (unlikely(rt2x00queue_write_tx_frame(queue, skb, false))) goto exit_fail; if (rt2x00queue_threshold(queue))