Merge remote branch 'origin/master'

[deliverable/linux.git] / drivers / net / znet.c

diff --git a/drivers/net/znet.c b/drivers/net/znet.c
index dbfef8d70f2dfdf7660496c473308b5302f1b1d9..c3a3292045114bf86a285622ad7b75efeef89fa3 100644 (file)
--- a/drivers/net/znet.c
+++ b/drivers/net/znet.c
@@ -587,7 +587,6 @@ static netdev_tx_t znet_send_packet(struct sk_buff *skb, struct net_device *dev)
                }
                spin_unlock_irqrestore (&znet->lock, flags);
 
-               dev->trans_start = jiffies;
                netif_start_queue (dev);
 
                if (znet_debug > 4)
@@ -802,7 +801,6 @@ static void znet_rx(struct net_device *dev)
        /* If any worth-while packets have been received, dev_rint()
           has done a mark_bh(INET_BH) for us and will work on them
           when we get to the bottom-half routine. */
-       return;
 }
 
 /* The inverse routine to znet_open(). */