From 178e360096bbe4d66e6c7e69c7b8715228592476 Mon Sep 17 00:00:00 2001
From: Cesar Eduardo Barros <cesarb@cesarb.net>
Date: Thu, 29 May 2008 21:58:36 -0300
Subject: [PATCH] --- yaml --- r: 97645 b: refs/heads/master c:
 6f94f709b5b1d3a9b5f1ff7d4f3534de6cde3ff6 h: refs/heads/master i:   97643:
 08414629e3dd76787336293581b4abd61334ceea v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/sc92031.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 90f088b15927..a843b18842d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17a9440f7deb781935c76e2e55d376a35611a6f9
+refs/heads/master: 6f94f709b5b1d3a9b5f1ff7d4f3534de6cde3ff6
diff --git a/trunk/drivers/net/sc92031.c b/trunk/drivers/net/sc92031.c
index b4b63805ee8f..61955f8d8011 100644
--- a/trunk/drivers/net/sc92031.c
+++ b/trunk/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;