From 7307cd70c55a1e175039b0bdb82adb8b6c52c7f2 Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Sun, 19 Jun 2011 21:51:26 +0000 Subject: [PATCH] --- yaml --- r: 255620 b: refs/heads/master c: 93e0ed158c15b3d3d76125de6364f8f95528c25a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ll_temac_main.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 71b4c5c660fb..6c6ed1af5704 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 570773c5801cc6c322534d6b1d1551e23664103e +refs/heads/master: 93e0ed158c15b3d3d76125de6364f8f95528c25a diff --git a/trunk/drivers/net/ll_temac_main.c b/trunk/drivers/net/ll_temac_main.c index e7b8afec73a1..e3f19255af28 100644 --- a/trunk/drivers/net/ll_temac_main.c +++ b/trunk/drivers/net/ll_temac_main.c @@ -728,6 +728,8 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev) if (lp->tx_bd_tail >= TX_BD_NUM) lp->tx_bd_tail = 0; + skb_tx_timestamp(skb); + /* Kick off the transfer */ lp->dma_out(lp, TX_TAILDESC_PTR, tail_p); /* DMA start */ @@ -773,7 +775,8 @@ static void ll_temac_recv(struct net_device *ndev) skb->ip_summed = CHECKSUM_COMPLETE; } - netif_rx(skb); + if (!skb_defer_rx_timestamp(skb)) + netif_rx(skb); ndev->stats.rx_packets++; ndev->stats.rx_bytes += length;