summaryrefslogtreecommitdiffstats
path: root/drivers/net/lib8390.c
diff options
context:
space:
mode:
authorRichard Cochran <richardcochran@gmail.com>2011-06-19 23:51:24 +0200
committerDavid S. Miller <davem@davemloft.net>2011-06-20 22:56:53 +0200
commitd76b7e2faaabae4805ae7ebf31ad64a33268f44f (patch)
treed849cfc5aabb7eb15f2bdaa6a9369ed81cd85a7d /drivers/net/lib8390.c
parentnet: export the receive time stamping hook for non-NAPI drivers (diff)
downloadlinux-d76b7e2faaabae4805ae7ebf31ad64a33268f44f.tar.xz
linux-d76b7e2faaabae4805ae7ebf31ad64a33268f44f.zip
lib8390: enable transmit and receive time stamping.
This patch enables software (and phy device) time stamping. This file is included by drivers/net/ax88796.c, which is based on phylib. So, this patch makes hardware time stamping in the PHY possible. Compile tested only. Signed-off-by: Richard Cochran <richard.cochran@omicron.at> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/lib8390.c')
-rw-r--r--drivers/net/lib8390.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/lib8390.c b/drivers/net/lib8390.c
index 17b75e5f1b0a..70eb2077bd22 100644
--- a/drivers/net/lib8390.c
+++ b/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)