diff options
| author | Richard Cochran <richardcochran@gmail.com> | 2011-06-12 02:18:59 +0000 |
|---|---|---|
| committer | David S. Miller <davem@conan.davemloft.net> | 2011-06-13 17:26:13 -0400 |
| commit | 18a03b9772da749efb8d92bd9893bfe3bd442425 (patch) | |
| tree | 76d9980bcfa3931688b16947d9c3e6bfa9b3177a /drivers/net/fec.c | |
| parent | 1c17216ee5b1902d82b121da2388bd57f49c4b62 (diff) | |
| download | linux-stable-18a03b9772da749efb8d92bd9893bfe3bd442425.tar.gz linux-stable-18a03b9772da749efb8d92bd9893bfe3bd442425.tar.bz2 linux-stable-18a03b9772da749efb8d92bd9893bfe3bd442425.zip | |
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>
Diffstat (limited to 'drivers/net/fec.c')
| -rw-r--r-- | drivers/net/fec.c | 5 |
1 files changed, 4 insertions, 1 deletions
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, |