From ec8aef24d8607050115b4aba2e66cef2492572ca Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Sun, 19 Jun 2011 03:31:44 +0000 Subject: [PATCH] --- yaml --- r: 255598 b: refs/heads/master c: 6241207253b940048ffb6ba483a248813261ce6a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/smsc9420.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d659ec7c508f..61db66cee9da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52f64faeb0fdcd49f14586beab83eabc9170b6a1 +refs/heads/master: 6241207253b940048ffb6ba483a248813261ce6a diff --git a/trunk/drivers/net/smsc9420.c b/trunk/drivers/net/smsc9420.c index 5555102bb964..459726f54754 100644 --- a/trunk/drivers/net/smsc9420.c +++ b/trunk/drivers/net/smsc9420.c @@ -1031,12 +1031,12 @@ static netdev_tx_t smsc9420_hard_start_xmit(struct sk_buff *skb, pd->tx_ring[index].status = TDES0_OWN_; wmb(); + skb_tx_timestamp(skb); + /* kick the DMA */ smsc9420_reg_write(pd, TX_POLL_DEMAND, 1); smsc9420_pci_flush_write(pd); - skb_tx_timestamp(skb); - return NETDEV_TX_OK; }