diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-04 11:50:00 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-04 11:50:00 -0700 |
| commit | 8b91ac09732895f928ed6107bda5318cf260520b (patch) | |
| tree | 5fc787bb3e0f4a4f84a928b7708023e4996608cd /drivers/net/sc92031.c | |
| parent | 8aca6cb1179ed9bef9351028c8d8af852903eae2 (diff) | |
| parent | 56997fa838e333cea33ab641d4aeedd23aef0eb1 (diff) | |
| download | kernel_samsung_tuna-8b91ac09732895f928ed6107bda5318cf260520b.zip kernel_samsung_tuna-8b91ac09732895f928ed6107bda5318cf260520b.tar.gz kernel_samsung_tuna-8b91ac09732895f928ed6107bda5318cf260520b.tar.bz2 | |
Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/sc92031.c')
| -rw-r--r-- | drivers/net/sc92031.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |