Hi,
kaweth used its own synchronisation superseded by usb_unlink_urb().
Please apply.
Regards
Oliver
Signed-off-by: Oliver Neukum <[EMAIL PROTECTED]>
You can import this changeset into BK by piping this whole message to:
'| bk receive [path to repository]' or apply the patch as usual.
===================================================================
[EMAIL PROTECTED], 2004-10-21 22:39:24+02:00, [EMAIL PROTECTED]
- replace old synchronisation logic with usb_kill_urb()
kaweth.c | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff -Nru a/drivers/usb/net/kaweth.c b/drivers/usb/net/kaweth.c
--- a/drivers/usb/net/kaweth.c Thu Oct 21 22:41:12 2004
+++ b/drivers/usb/net/kaweth.c Thu Oct 21 22:41:12 2004
@@ -729,7 +729,8 @@
struct sk_buff *skb = kaweth->tx_skb;
if (unlikely(urb->status != 0))
- kaweth_dbg("%s: TX status %d.", kaweth->net->name, urb->status);
+ if (urb->status != -ENOENT)
+ kaweth_dbg("%s: TX status %d.", kaweth->net->name,
urb->status);
netif_wake_queue(kaweth->net);
dev_kfree_skb_irq(skb);
@@ -1153,15 +1154,7 @@
kaweth->removed = 1;
usb_kill_urb(kaweth->irq_urb);
usb_kill_urb(kaweth->rx_urb);
-
- /* we need to wait for the urb to be cancelled, if it is active */
- spin_lock(&kaweth->device_lock);
- if (usb_unlink_urb(kaweth->tx_urb) == -EINPROGRESS) {
- spin_unlock(&kaweth->device_lock);
- wait_event(kaweth->term_wait, kaweth->end);
- } else {
- spin_unlock(&kaweth->device_lock);
- }
+ usb_kill_urb(kaweth->tx_urb);
if(kaweth->net) {
if(kaweth->net->flags & IFF_UP) {
===================================================================
This BitKeeper patch contains the following changesets:
1.2037
## Wrapped with gzip_uu ##
M'XL( .@>>$$ \U4:VO;,!3];/V*NY9"0FM;DA6_AD.W)FQEHPU9"OL6%%N-
[EMAIL PROTECTED]&1+%VCV8H/9QD*^5^?<>^[!IW"G1!U;LBP>1(U.X;U4VFQ%
M)2OAY'(IRJ):/[EMAIL PROTECTED]/[EMAIL PROTECTED]@CE;F2]H#XR&2.NTQP,E(HM
MXGC[+_II)6)K/'QW]_'-&*$D@:N<5W/Q26A($J1E_<#+3%URG9>R<G3-*[44
MFCNI7#;[U(9B3,W=(X&'>WY#?,R")B49(9P1D6'*0I\]HZU6:[EMAIL PROTECTED];#LX
M!&($4V(6QDA##6" !D <BKT ,',)=BD!2F,OBBD[QS3&&'8J7;ZD#IP3L#%Z
M"W^WE2N4@@VU6)4\%88_ _54I7DMJT)Q7<@[EMAIL PROTECTED]>UFDT715E.U_6L
MTT4?3/D41VCTK#6R?_-""'.,^K!JI_AR2UG=BJ)<P^XN^$;HW$GWW5%L),8-
M"2/J-3,1<<;P_8QE68H9_9&>!["5T ?0V]&9284T:IBA\;:..G:[EMAIL PROTECTED]
MT7Y2/(E(T"->T/@[EMAIL PROTECTED];C>26[#KS?8Q-AH=G<X?
M6'(0>!0(NFX7BBRKN(>.X;;[2G.]5O J 7MX<SN\F71-U-HQ3;/9O'-RIF*8
M?(:OB6>9<W(!N[C=-U69%U^*"[EMAIL PROTECTED]:#0CI^1"A:T)[EMAIL PROTECTED]'=>/[=:D
:[W]Z:2[2A5HO$][+PI#Q$'T!9_N ,&\%
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
