Patchwork netxen: Fix Unlikely(x) > y

login
register
mail settings
Submitter Dhananjay Phadke
Date Oct. 7, 2009, 5:34 a.m.
Message ID <7608421F3572AB4292BB2532AE89D5658B0B6A7C12@AVEXMB1.qlogic.org>
Download mbox | patch
Permalink /patch/35249/
State Accepted
Delegated to: David Miller
Headers show

Comments

Dhananjay Phadke - Oct. 7, 2009, 5:34 a.m.
Oh sure, that was a typo. Thanks for catching it. 

Acked-by: Dhananjay Phadke <dhananjay@netxen.com>

-----Original Message-----
From: Roel Kluin [mailto:roel.kluin@gmail.com] 
Sent: Tuesday, October 06, 2009 06:24
To: Dhananjay Phadke; netdev@vger.kernel.org; Andrew Morton
Subject: [PATCH] netxen: Fix Unlikely(x) > y

The closing parenthesis was not on the right location.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
This was intended, I think?

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Oct. 7, 2009, 10:42 a.m.
From: Dhananjay Phadke <dhananjay.phadke@qlogic.com>
Date: Tue, 6 Oct 2009 22:34:39 -0700

> Oh sure, that was a typo. Thanks for catching it. 
> 
> Acked-by: Dhananjay Phadke <dhananjay@netxen.com>

Applied, thanks everyone.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index b5aa974..9b9eab1 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -1714,7 +1714,7 @@  netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 	/* 4 fragments per cmd des */
 	no_of_desc = (frag_count + 3) >> 2;
 
-	if (unlikely(no_of_desc + 2) > netxen_tx_avail(tx_ring)) {
+	if (unlikely(no_of_desc + 2 > netxen_tx_avail(tx_ring))) {
 		netif_stop_queue(netdev);
 		return NETDEV_TX_BUSY;
 	}