From: Richard Cochran <richardcochran@gmail.com>
Date: Sun, 12 Jun 2011 02:18:59 +0000 (+0000)
Subject: fec: enable transmit and receive time stamping.
X-Git-Tag: MMI-PSA29.97-13-9~18929^2~451^2~43
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=18a03b9772da749efb8d92bd9893bfe3bd442425;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

fec: enable transmit and receive time stamping.

This patch has been tested on the Freescale M5234BCC, which includes the
National Semiconductor DP83640 with IEEE 1588 support.

Cc: Greg Ungerer <gerg@uclinux.org>
Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: Shawn Guo <shawn.guo@freescale.com>
Signed-off-by: Richard Cochran <richard.cochran@omicron.at>
Signed-off-by: David S. Miller <davem@conan.davemloft.net>
---

diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 885d8baff7d5..965fe90e1c20 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -326,6 +326,8 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 
 	spin_unlock_irqrestore(&fep->hw_lock, flags);
 
+	skb_tx_timestamp(skb);
+
 	return NETDEV_TX_OK;
 }
 
@@ -650,7 +652,8 @@ fec_enet_rx(struct net_device *ndev)
 			skb_put(skb, pkt_len - 4);	/* Make room */
 			skb_copy_to_linear_data(skb, data, pkt_len - 4);
 			skb->protocol = eth_type_trans(skb, ndev);
-			netif_rx(skb);
+			if (!skb_defer_rx_timestamp(skb))
+				netif_rx(skb);
 		}
 
 		bdp->cbd_bufaddr = dma_map_single(&fep->pdev->dev, data,