Date: Wed, 11 Feb 2009 15:29:04 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 157546 for review Message-ID: <200902111529.n1BFT4Qi044672@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=157546 Change 157546 by hselasky@hselasky_laptop001 on 2009/02/11 15:28:15 USB WLAN: Revert looping on the control request in case of error. It did not solve the problem it turns out. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#37 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#36 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#37 (text+ko) ==== @@ -584,21 +584,12 @@ { usb2_error_t err; - /* - * Occasionally the RUM chip will just generate control - * request timeouts. Probably a USB driver bug in the - * firmware! Try to workaround the problem. - */ - retry: err = usb2_do_request_proc(sc->sc_udev, &sc->sc_tq, req, data, 0, NULL, 250 /* ms */); if (err) { - if (!usb2_proc_is_gone(&sc->sc_tq)) { - DPRINTFN(1, "Control request failed! (ignored)\n"); - rum_pause(sc, hz / 100); - goto retry; - } + DPRINTFN(1, "Control request failed! (ignored)\n"); + rum_pause(sc, hz / 100); } return; } ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#36 (text+ko) ==== @@ -570,16 +570,12 @@ { usb2_error_t err; - retry: err = usb2_do_request_proc(sc->sc_udev, &sc->sc_tq, req, data, 0, NULL, 250 /* ms */); if (err) { - if (!usb2_proc_is_gone(&sc->sc_tq)) { - DPRINTFN(1, "Control request failed! (ignored)\n"); - ural_pause(sc, hz / 100); - goto retry; - } + DPRINTFN(1, "Control request failed! (ignored)\n"); + ural_pause(sc, hz / 100); } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902111529.n1BFT4Qi044672>