]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
fec_mpc52xx: enable transmit and receive time stamping.
authorRichard Cochran <richardcochran@gmail.com>
Sun, 19 Jun 2011 21:51:27 +0000 (21:51 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 20 Jun 2011 20:56:54 +0000 (13:56 -0700)
This patch enables software (and phy device) time stamping. Software
time stamping using the SO_TIMESTAMPING API was tested and found to be
working on the LITE5200B board.

Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Richard Cochran <richard.cochran@omicron.at>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/fec_mpc52xx.c

index eba0f696a51f54a425d7b71340b01ed6d13390d0..cecc3b1eb48688b6de2c997b143e7a269639fdd9 100644 (file)
@@ -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);
        }