From e971e82007e4f629dbc738d926739ff7e6d36da7 Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Sun, 19 Jun 2011 21:51:27 +0000 Subject: [PATCH] --- yaml --- r: 255621 b: refs/heads/master c: d6cf07327e691e8f7c0f08af69d0dd3887aa1e4f h: refs/heads/master i: 255619: 6d45fe39eb539b56ec113b72bdc4284f0570369c v: v3 --- [refs] | 2 +- trunk/drivers/net/fec_mpc52xx.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6c6ed1af5704..95c574106374 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93e0ed158c15b3d3d76125de6364f8f95528c25a +refs/heads/master: d6cf07327e691e8f7c0f08af69d0dd3887aa1e4f diff --git a/trunk/drivers/net/fec_mpc52xx.c b/trunk/drivers/net/fec_mpc52xx.c index eba0f696a51f..cecc3b1eb486 100644 --- a/trunk/drivers/net/fec_mpc52xx.c +++ b/trunk/drivers/net/fec_mpc52xx.c @@ -336,6 +336,7 @@ static int mpc52xx_fec_start_xmit(struct sk_buff *skb, struct net_device *dev) bd->skb_pa = dma_map_single(dev->dev.parent, skb->data, skb->len, DMA_TO_DEVICE); + skb_tx_timestamp(skb); bcom_submit_next_buffer(priv->tx_dmatsk, skb); spin_unlock_irqrestore(&priv->lock, flags); @@ -435,7 +436,8 @@ static irqreturn_t mpc52xx_fec_rx_interrupt(int irq, void *dev_id) length = status & BCOM_FEC_RX_BD_LEN_MASK; skb_put(rskb, length - 4); /* length without CRC32 */ rskb->protocol = eth_type_trans(rskb, dev); - netif_rx(rskb); + if (!skb_defer_rx_timestamp(skb)) + netif_rx(rskb); spin_lock(&priv->lock); }