projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[cascardo/linux.git]
/
drivers
/
net
/
fec.c
diff --git
a/drivers/net/fec.c
b/drivers/net/fec.c
index
965fe90
..
7ae3f28
100644
(file)
--- a/
drivers/net/fec.c
+++ b/
drivers/net/fec.c
@@
-324,10
+324,10
@@
fec_enet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
fep->cur_tx = bdp;
fep->cur_tx = bdp;
- spin_unlock_irqrestore(&fep->hw_lock, flags);
-
skb_tx_timestamp(skb);
skb_tx_timestamp(skb);
+ spin_unlock_irqrestore(&fep->hw_lock, flags);
+
return NETDEV_TX_OK;
}
return NETDEV_TX_OK;
}