From nobody Thu Nov 24 23:17:37 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NJDRk1XX8z4jPdP; Thu, 24 Nov 2022 23:17:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NJDRk14BTz49cs; Thu, 24 Nov 2022 23:17:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669331858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PZ2czUho7EN6C2kdW5Sk4oeXopw+hJFnrjbxEw8jx+g=; b=Ww5qBL55AP2+eNQP3pWa1ILNtrKG6DZ6YXZ8kU75blN48oJeekHk23kz6NxVvvARjxy7GQ kxom8l47l/2qJzN0G0rMo+xutCfF6vSRfpPufS26/689cgr3h4+MpLfsogYzhhJRKXQ6D6 SpnQ3dmsvZOka4IDtJtl2k88k2YrwQ/b1PuaSXu0/ZcIPG/M2IRhmmNFau9V91/mvXzfBY 9bzQ4jzGFpwKGccZ9aiCnKwDAVInnvalFnhmQjTQb1gQedaz85uiHLxhvz5muQgO/ui4N0 VGTdbh3EGNBqbt3l8WxGOPCIa045XOFpfn8W5AOivvJl93NfbTqmhd4u2U5cuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669331858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PZ2czUho7EN6C2kdW5Sk4oeXopw+hJFnrjbxEw8jx+g=; b=XUXJ0eHM2+HkwxlqR+n44rGDzWC+ehEsCreZRinGyZ0Kwy4DZwjdATcCrFoVPUXU8n73n5 /Hn2MFyGo+fi7QmVxGBX4S5Ch6KxuciH6+zpWCh5L3OeIHlxXqFolMt0v7DqShjHGt3UUp 7IbjD+DBXcyCAyHxNHCkLi2wYAKmx91b221g9+AA0ImxRbndHRgttAq8tg2hiUPdWRYfKU PG84+O2XeAGDKbp0Pi6IbPkiMwX/04iK8tk2+cXuksbsq9alq/wtyCx3zGEBXzX5E2EBeB +ODhKV3c/eX2NSf4Rh8534nkqvdLd4L+qOWYY7Q9KxB4MqYfIHLM8QpdvBmi5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669331858; a=rsa-sha256; cv=none; b=mHvp9MESoUxblJ+nKJXy09AhDqEYsoyp5V09FNjYQUILF02JDHDl/IxHEiAnd4YzFFn6/E BZ1Yj/5SC/x6+nnV1z5qsNg/hdjkyLxTk3O+jZWRU4TNGFj8oJ7jMNWv23Dayy+cuqzd+J qyGliW4DgjZYywEpgULGvh5hOXZ03ImybTrcPxEgsfmNxG6Y1pkfSsw+lLW/ReG243rB9E vHbepIylBThEW9y50urcAJdlRR0TcllJqpi4a3APSuYAQzErrvFOooclgH+3Bb0zWrcUx/ DbnpA8TYHoSpDEvVs9+sYkXS3yCEjx53+5+qw9PSlWD9qexTvczPYrp/eYM3kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NJDRk0273zK4p; Thu, 24 Nov 2022 23:17:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AONHbiA006993; Thu, 24 Nov 2022 23:17:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AONHb55006992; Thu, 24 Nov 2022 23:17:37 GMT (envelope-from git) Date: Thu, 24 Nov 2022 23:17:37 GMT Message-Id: <202211242317.2AONHb55006992@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 03357811dec7 - stable/12 - ng_ubt: Do not clear stall before receiving of HCI command response. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 03357811dec7ea46e804922dc07b34ac02b66fb9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=03357811dec7ea46e804922dc07b34ac02b66fb9 commit 03357811dec7ea46e804922dc07b34ac02b66fb9 Author: Vladimir Kondratyev AuthorDate: 2021-04-15 14:25:00 +0000 Commit: Vladimir Kondratyev CommitDate: 2022-11-24 23:13:13 +0000 ng_ubt: Do not clear stall before receiving of HCI command response. Unconditional execution of "clear feature" request at SETUP stage was workaround for probe failures on ng_ubt.ko re-kldloading which is unnecessary now. Reviewed by: hselasky MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D29775 (cherry picked from commit 52489f2a55e625ea35bccc3749ca3adad6ce0c54) --- sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c index d641aadad60d..ef5bfc90114b 100644 --- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c +++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c @@ -827,8 +827,6 @@ ubt_probe_intr_callback(struct usb_xfer *xfer, usb_error_t error) case USB_ST_SETUP: submit_next: - /* Try clear stall first */ - usbd_xfer_set_stall(xfer); usbd_xfer_set_frame_len(xfer, 0, usbd_xfer_max_len(xfer)); usbd_transfer_submit(xfer); break; @@ -837,6 +835,8 @@ submit_next: if (error != USB_ERR_CANCELLED) { printf("ng_ubt: interrupt transfer failed: %s\n", usbd_errstr(error)); + /* Try clear stall first */ + usbd_xfer_set_stall(xfer); goto submit_next; } break;