atl1e: convert to net_device_ops

[linux-2.6-omap-h63xx.git] / drivers / net / sc92031.c

diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c
index b4b63805ee8f094b0ca9fbefd38a9ed565002ce9..590f2175e9e0af8dcaf9a6afee90f5033d056d9f 100644 (file)
--- a/drivers/net/sc92031.c
+++ b/drivers/net/sc92031.c
@@ -816,7 +816,6 @@ static void _sc92031_rx_tasklet(struct net_device *dev)
                }
 
                skb->protocol = eth_type_trans(skb, dev);
-               dev->last_rx = jiffies;
                netif_rx(skb);
 
                dev->stats.rx_bytes += pkt_size;
@@ -972,7 +971,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;