---

yaml --- r: 255515 b: refs/heads/master c: 18a03b9 h: refs/heads/master i: 255513: d060136 255511: e548159 v: v3
git-mirror · Jun 13, 2011 · bd68231 · bd68231
1 parent a558f70
commit bd68231
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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,