Commit 6f94f709 authored by Cesar Eduardo Barros's avatar Cesar Eduardo Barros Committed by Jeff Garzik

sc92031: remove bogus unlikely()

Commit 5a0a92e6 mentions len < ETH_ZLEN
is true for ARP packets. This obviously is not unlikely.
Signed-off-by: default avatarCesar Eduardo Barros <cesarb@cesarb.net>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 17a9440f
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment