From patchwork Thu Mar 3 18:40:33 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: 606921 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 p23Imj2i021009 for ; Thu, 3 Mar 2011 18:49:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758686Ab1CCSs0 (ORCPT ); Thu, 3 Mar 2011 13:48:26 -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 S932182Ab1CCSsZ (ORCPT ); Thu, 3 Mar 2011 13:48:25 -0500 Received: by mail-wy0-f174.google.com with SMTP id 36so1356532wyg.19 for ; Thu, 03 Mar 2011 10:48:25 -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=WvYJQfA8qRLOFFQlT/1JbCbsQAHFunKtJbGrG3SkE1I=; b=ozx6QcRVwB6L6JMtb3gW7tzgOlWKHT5h9KUbtgZz+5ZojwgyHcwU7rna9fepD/kNYn pO6tBmnF0S7kDvEnALSBjoEAJurYxmnhxXk32ht7tJts7cTzekgST/klB6W9uK44Jvqq Iwpjp1tMhmdikWgHXbC0B5bkjqEWMbi2fQAUk= 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=eACzwoevqOUvCEt+/nByCchwrFB4RcHnmKuSsanmFOHUsuxy0s824tMcu7QM/9XENx sWAoamkCMldkt2g3AO7s+BTr4DvY+7H7gEGXnKfd3X8qO57Pv3gpzjDRtBprjJSNXRMm U4FxFosHM6kv8q7zc5XnTsaGclkid8YDDDrMs= Received: by 10.216.171.68 with SMTP id q46mr903222wel.98.1299178105347; Thu, 03 Mar 2011 10:48:25 -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.22 (version=SSLv3 cipher=OTHER); Thu, 03 Mar 2011 10:48:24 -0800 (PST) From: Ivo van Doorn To: "John W. Linville" Subject: [PATCH 04/19] rt2x00: Add unlikely macro to special case tx status handling Date: Thu, 3 Mar 2011 19:40:33 +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.28091.IvDoorn@gmail.com> <201103031939.57117.IvDoorn@gmail.com> In-Reply-To: <201103031939.57117.IvDoorn@gmail.com> MIME-Version: 1.0 Message-Id: <201103031940.34167.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/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 7dba354..66ff8d5 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; }