git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
cleanup: remove pppoe_ioctl() declaration.
[safe/jmp/linux-2.6]
/
drivers
/
net
/
s6gmac.c
diff --git
a/drivers/net/s6gmac.c
b/drivers/net/s6gmac.c
index
6b12524
..
a7ff8ea
100644
(file)
--- a/
drivers/net/s6gmac.c
+++ b/
drivers/net/s6gmac.c
@@
-852,8
+852,8
@@
static int s6gmac_tx(struct sk_buff *skb, struct net_device *dev)
{
struct s6gmac *pd = netdev_priv(dev);
unsigned long flags;
+
spin_lock_irqsave(&pd->lock, flags);
- dev->trans_start = jiffies;
writel(skb->len << S6_GMAC_BURST_PREWR_LEN |
0 << S6_GMAC_BURST_PREWR_CFE |
1 << S6_GMAC_BURST_PREWR_PPE |