From owner-svn-src-stable-8@FreeBSD.ORG Tue Apr 6 23:17:14 2010 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 680041065676; Tue, 6 Apr 2010 23:17:14 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3A3D08FC1E; Tue, 6 Apr 2010 23:17:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o36NHErk010169; Tue, 6 Apr 2010 23:17:14 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o36NHEt7010166; Tue, 6 Apr 2010 23:17:14 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <201004062317.o36NHEt7010166@svn.freebsd.org> From: Andrew Thompson Date: Tue, 6 Apr 2010 23:17:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r206294 - stable/8/sys/dev/usb/wlan X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2010 23:17:14 -0000 Author: thompsa Date: Tue Apr 6 23:17:13 2010 New Revision: 206294 URL: http://svn.freebsd.org/changeset/base/206294 Log: MFC r203141 Attempt to recover on a TX error rather than stopping all transfers. Submitted by: Hans Petter Selesky Modified: stable/8/sys/dev/usb/wlan/if_rum.c stable/8/sys/dev/usb/wlan/if_zyd.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/dev/usb/wlan/if_rum.c ============================================================================== --- stable/8/sys/dev/usb/wlan/if_rum.c Tue Apr 6 23:16:40 2010 (r206293) +++ stable/8/sys/dev/usb/wlan/if_rum.c Tue Apr 6 23:17:13 2010 (r206294) @@ -845,13 +845,18 @@ tr_setup: usbd_xfer_set_priv(xfer, NULL); } - if (error == USB_ERR_STALLED) { - /* try to clear stall first */ + if (error != USB_ERR_CANCELLED) { + if (error == USB_ERR_TIMEOUT) + device_printf(sc->sc_dev, "device timeout\n"); + + /* + * Try to clear stall first, also if other + * errors occur, hence clearing stall + * introduces a 50 ms delay: + */ usbd_xfer_set_stall(xfer); goto tr_setup; } - if (error == USB_ERR_TIMEOUT) - device_printf(sc->sc_dev, "device timeout\n"); break; } } Modified: stable/8/sys/dev/usb/wlan/if_zyd.c ============================================================================== --- stable/8/sys/dev/usb/wlan/if_zyd.c Tue Apr 6 23:16:40 2010 (r206293) +++ stable/8/sys/dev/usb/wlan/if_zyd.c Tue Apr 6 23:17:13 2010 (r206294) @@ -2449,13 +2449,18 @@ tr_setup: if (data != NULL) zyd_tx_free(data, error); - if (error == USB_ERR_STALLED) { - /* try to clear stall first */ + if (error != USB_ERR_CANCELLED) { + if (error == USB_ERR_TIMEOUT) + device_printf(sc->sc_dev, "device timeout\n"); + + /* + * Try to clear stall first, also if other + * errors occur, hence clearing stall + * introduces a 50 ms delay: + */ usbd_xfer_set_stall(xfer); goto tr_setup; } - if (error == USB_ERR_TIMEOUT) - device_printf(sc->sc_dev, "device timeout\n"); break; } }