diff options
| author |   Herbert Xu <herbert@gondor.apana.org.au> | 2010-05-26 11:36:58 +1000 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2010-05-26 11:36:58 +1000 |
| commit | 50d1e9302bab7d35dae7146f8c468e0943015616 (patch) | |
| tree | fa05320f4a297bd582686574cf94ba444e264b3f /drivers/net/netx-eth.c | |
| parent | crypto: mv_cesa - fixup error handling in mv_probe() (diff) | |
| parent | n2_crypto: Add HMAC support. (diff) | |
| download | linux-dev-50d1e9302bab7d35dae7146f8c468e0943015616.tar.xz linux-dev-50d1e9302bab7d35dae7146f8c468e0943015616.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/crypto-2.6
Diffstat (limited to 'drivers/net/netx-eth.c')
| -rw-r--r-- | drivers/net/netx-eth.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/netx-eth.c b/drivers/net/netx-eth.c index 64770298c4f7..2e4b42175f3f 100644 --- a/drivers/net/netx-eth.c +++ b/drivers/net/netx-eth.c @@ -126,7 +126,6 @@ netx_eth_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev) FIFO_PTR_FRAMENO(1) | FIFO_PTR_FRAMELEN(len)); - ndev->trans_start = jiffies; ndev->stats.tx_packets++; ndev->stats.tx_bytes += skb->len; |