git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.17-1.2187_FC5 patched with stable patch-2.6.17.13-vs2...
[linux-2.6.git]
/
drivers
/
net
/
irda
/
vlsi_ir.c
diff --git
a/drivers/net/irda/vlsi_ir.c
b/drivers/net/irda/vlsi_ir.c
index
97a49e0
..
d70b9e8
100644
(file)
--- a/
drivers/net/irda/vlsi_ir.c
+++ b/
drivers/net/irda/vlsi_ir.c
@@
-959,7
+959,7
@@
static int vlsi_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev)
|| (now.tv_sec==ready.tv_sec && now.tv_usec>=ready.tv_usec))
break;
udelay(100);
- /* must not sleep here -
we are called under xmit
_lock! */
+ /* must not sleep here -
called under netif_tx
_lock! */
}
}