X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=drivers%2Fnet%2Fsc92031.c;h=61955f8d80119705806b9fd8ab9714cd56bcff2c;hb=4f46d6e7e5ffbce0ee1d1a80767fdf45e56cc863;hp=b4b63805ee8f094b0ca9fbefd38a9ed565002ce9;hpb=7bece8155be133cd67c41eed2b31c60a310609de;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c
index b4b63805ee8..61955f8d801 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;