From bd6823144ca8e43f8828b28819213e955583b41a Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Sun, 12 Jun 2011 02:18:59 +0000 Subject: [PATCH] --- yaml --- r: 255515 b: refs/heads/master c: 18a03b9772da749efb8d92bd9893bfe3bd442425 h: refs/heads/master i: 255513: d0601367d5fabe3a7b5519b67f52ddb9ac8bca8c 255511: e548159d62bc2dc594cc3f3cae9d1d98ec4b4380 v: v3 --- [refs] | 2 +- trunk/drivers/net/fec.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bd27918a201b..69a43ad50ccc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c17216ee5b1902d82b121da2388bd57f49c4b62 +refs/heads/master: 18a03b9772da749efb8d92bd9893bfe3bd442425 diff --git a/trunk/drivers/net/fec.c b/trunk/drivers/net/fec.c index 885d8baff7d5..965fe90e1c20 100644 --- a/trunk/drivers/net/fec.c +++ b/trunk/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,