From 6b12fbb63b9fc62ebcae2432155db3ce481ee6cf Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Sun, 19 Jun 2011 21:51:24 +0000 Subject: [PATCH] --- yaml --- r: 255618 b: refs/heads/master c: d76b7e2faaabae4805ae7ebf31ad64a33268f44f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/lib8390.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9c5e300398b9..0d127ad80e70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 238442f6bc10ba31577fc47e476c88689c80c7fa +refs/heads/master: d76b7e2faaabae4805ae7ebf31ad64a33268f44f diff --git a/trunk/drivers/net/lib8390.c b/trunk/drivers/net/lib8390.c index 17b75e5f1b0a..70eb2077bd22 100644 --- a/trunk/drivers/net/lib8390.c +++ b/trunk/drivers/net/lib8390.c @@ -410,7 +410,7 @@ static netdev_tx_t __ei_start_xmit(struct sk_buff *skb, spin_unlock(&ei_local->page_lock); enable_irq_lockdep_irqrestore(dev->irq, &flags); - + skb_tx_timestamp(skb); dev_kfree_skb (skb); dev->stats.tx_bytes += send_length; @@ -758,7 +758,8 @@ static void ei_receive(struct net_device *dev) skb_put(skb, pkt_len); /* Make room */ ei_block_input(dev, pkt_len, skb, current_offset + sizeof(rx_frame)); skb->protocol=eth_type_trans(skb,dev); - netif_rx(skb); + if (!skb_defer_rx_timestamp(skb)) + netif_rx(skb); dev->stats.rx_packets++; dev->stats.rx_bytes += pkt_len; if (pkt_stat & ENRSR_PHY)