diff options
author | Richard Cochran <richardcochran@gmail.com> | 2011-06-19 17:51:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-06-20 16:56:53 -0400 |
commit | d76b7e2faaabae4805ae7ebf31ad64a33268f44f (patch) | |
tree | d849cfc5aabb7eb15f2bdaa6a9369ed81cd85a7d | |
parent | 238442f6bc10ba31577fc47e476c88689c80c7fa (diff) |
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>
-rw-r--r-- | drivers/net/lib8390.c | 5 |
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, | |||
410 | 410 | ||
411 | spin_unlock(&ei_local->page_lock); | 411 | spin_unlock(&ei_local->page_lock); |
412 | enable_irq_lockdep_irqrestore(dev->irq, &flags); | 412 | enable_irq_lockdep_irqrestore(dev->irq, &flags); |
413 | 413 | skb_tx_timestamp(skb); | |
414 | dev_kfree_skb (skb); | 414 | dev_kfree_skb (skb); |
415 | dev->stats.tx_bytes += send_length; | 415 | dev->stats.tx_bytes += send_length; |
416 | 416 | ||
@@ -758,7 +758,8 @@ static void ei_receive(struct net_device *dev) | |||
758 | skb_put(skb, pkt_len); /* Make room */ | 758 | skb_put(skb, pkt_len); /* Make room */ |
759 | ei_block_input(dev, pkt_len, skb, current_offset + sizeof(rx_frame)); | 759 | ei_block_input(dev, pkt_len, skb, current_offset + sizeof(rx_frame)); |
760 | skb->protocol=eth_type_trans(skb,dev); | 760 | skb->protocol=eth_type_trans(skb,dev); |
761 | netif_rx(skb); | 761 | if (!skb_defer_rx_timestamp(skb)) |
762 | netif_rx(skb); | ||
762 | dev->stats.rx_packets++; | 763 | dev->stats.rx_packets++; |
763 | dev->stats.rx_bytes += pkt_len; | 764 | dev->stats.rx_bytes += pkt_len; |
764 | if (pkt_stat & ENRSR_PHY) | 765 | if (pkt_stat & ENRSR_PHY) |