From: Cesar Eduardo Barros <cesarb@cesarb.net>
Date: Fri, 30 May 2008 00:58:36 +0000 (-0300)
Subject: sc92031: remove bogus unlikely()
X-Git-Tag: v2.6.26-rc5~1^2~16^2~7
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f94f709b5b1d3a9b5f1ff7d4f3534de6cde3ff6;p=linux-2.6

sc92031: remove bogus unlikely()

Commit 5a0a92e67b5009a71e011658da04fb92dad8961f mentions len < ETH_ZLEN
is true for ARP packets. This obviously is not unlikely.

Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
---

diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c
index b4b63805ee..61955f8d80 100644
--- a/drivers/net/sc92031.c
+++ b/drivers/net/sc92031.c
@@ -972,7 +972,7 @@ static int sc92031_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	skb_copy_and_csum_dev(skb, priv->tx_bufs + entry * TX_BUF_SIZE);
 
 	len = skb->len;
-	if (unlikely(len < ETH_ZLEN)) {
+	if (len < ETH_ZLEN) {
 		memset(priv->tx_bufs + entry * TX_BUF_SIZE + len,
 				0, ETH_ZLEN - len);
 		len = ETH_ZLEN;