X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Fnet%2Fsc92031.c;h=61955f8d80119705806b9fd8ab9714cd56bcff2c;hb=85082fd7cbe3173198aac0eb5e85ab1edcc6352c;hp=b4b63805ee8f094b0ca9fbefd38a9ed565002ce9;hpb=5a0a92e67b5009a71e011658da04fb92dad8961f;p=safe%2Fjmp%2Flinux-2.6

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