summaryrefslogtreecommitdiff
path: root/drivers/net/sc92031.c
diff options
context:
space:
mode:
authorCesar Eduardo Barros <cesarb@cesarb.net>2008-05-29 21:58:36 -0300
committerJeff Garzik <jgarzik@redhat.com>2008-05-30 22:07:17 -0400
commit6f94f709b5b1d3a9b5f1ff7d4f3534de6cde3ff6 (patch)
treecb7f485ca55cdb36df949c78ef5bb892b62d20f3 /drivers/net/sc92031.c
parent17a9440f7deb781935c76e2e55d376a35611a6f9 (diff)
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>
Diffstat (limited to 'drivers/net/sc92031.c')
-rw-r--r--drivers/net/sc92031.c2
1 files changed, 1 insertions, 1 deletions
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;