Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux...

[mv-sheeva.git] / drivers / net / 3c501.c

diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c
index 3ea42ff176577900c734b5e9d7bbd67973a1d324..1776ab61b05fffedc7a18eaa755de9a64451f15f 100644 (file)
--- a/drivers/net/3c501.c
+++ b/drivers/net/3c501.c
@@ -480,7 +480,6 @@ static netdev_tx_t el_start_xmit(struct sk_buff *skb, struct net_device *dev)
                        /* fire ... Trigger xmit.  */
                        outb(AX_XMIT, AX_CMD);
                        lp->loading = 0;
-                       dev->trans_start = jiffies;
                        if (el_debug > 2)
                                pr_debug(" queued xmit.\n");
                        dev_kfree_skb(skb);
@@ -727,7 +726,6 @@ static void el_receive(struct net_device *dev)
                dev->stats.rx_packets++;
                dev->stats.rx_bytes += pkt_len;
        }
-       return;
 }
 
 /**