Skip to contentSkip to conversation

netxen: Fix Unlikely(x) > y

PATCH Applied Roel Kluin 3 participants 3 messages Oct 6, 2009 – Oct 7, 2009

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Roel Kluin

author
#0 lore raw

PATCH 1/1 netxen: Fix Unlikely(x) > y

The closing parenthesis was not on the right location.

Signed-off-by Roel Kluin <[email protected]>

---
This was intended, I think?

drivers/net/netxen/netxen_nic_main.c +1 -1
index b5aa974..9b9eab1 100644
@@ -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;
 	}
Acked-by on v1 1/1
#1 lore raw

Oh sure, that was a typo. Thanks for catching it.

Acked-by Dhananjay Phadke <[email protected]>

-----Original Message-----
From: Roel Kluin [mailto:[email protected]]
Sent: Tuesday, October 06, 2009 06:24
To: Dhananjay Phadke; [email protected]; Andrew Morton
Subject: [PATCH] netxen: Fix Unlikely(x) > y

The closing parenthesis was not on the right location.

Signed-off-by Roel Kluin <[email protected]>

---
This was intended, I think?

drivers/net/netxen/netxen_nic_main.c +1 -1
index b5aa974..9b9eab1 100644
@@ -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;
 	}