---

yaml --- r: 97645 b: refs/heads/master c: 6f94f70 h: refs/heads/master i: 97643: 0841462 v: v3
git-mirror · May 31, 2008 · 178e360 · 178e360
1 parent af145b2
commit 178e360
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;