From nobody Fri May 13 17:58:43 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 47F8D1AE8F39; Fri, 13 May 2022 17:58:44 +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 4L0Gbm0CL8z4X2C; Fri, 13 May 2022 17:58:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652464724; 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=gF8JIOqzOA6sDnnI57bglcwHOOn9EW9xyggSLaQ+UnE=; b=CPOldLMO4YKYc5/xOr9mQyVpVZGWoVSTnvY33s/5g9gpoYg/rt14wOauhcb8BFN5RB+0Xj rIVLZsrXPm+mIgcPcL1Qu7iLYrCzc+YcEqpsQeeF1acITb0QF3LjKU6H4U0Bb4YnSBs+cg 7BTw/Qa7nqJm2RnscT5iq6SL4NhKqbLJ3LJzwalULgAnJnUrBcDmIox2AzRVgR4JHzpMal qEU54bwXAWAp04rOoo5nBodyBjGs9GDZyDd6494pVYkP3loCCLUHNhU2fj7eWTA2TGPdZ3 aYFEcA100i5Cnc/MSDrwl2m1nyI9rgTbhAi3ELOuES+e4w3b4suvupCcKMCexA== 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 B82A7276BF; Fri, 13 May 2022 17:58:43 +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 24DHwhmp069442; Fri, 13 May 2022 17:58:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24DHwhuL069441; Fri, 13 May 2022 17:58:43 GMT (envelope-from git) Date: Fri, 13 May 2022 17:58:43 GMT Message-Id: <202205131758.24DHwhuL069441@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 3fc514f4a722 - stable/13 - otus: Return computed error value instead of ENXIO from otus_raw_xmit. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3fc514f4a7229492aeebda36494f1372b63f5cda Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652464724; 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=gF8JIOqzOA6sDnnI57bglcwHOOn9EW9xyggSLaQ+UnE=; b=sPegxmIoRR47mRsvXtsAsevIk1rQBn1byFdUXHM1UTaWwywG0GZf3OyUGeoAZkKKXVeIZ4 iRitzt/zRPoAguK73UsCkdFRAqF4AJ96zN7aAVJ5nCzCsIiGGF/sI1PqOU2xeB5iuDyB8P unLEKzK3ewjsRBFhkqm7p38ykvjfu94SlMyhWnTDwZMNzG5HQaXm9RM2aLz3hyV4jrP/Gx awCwH4pX5rHQZK+57d0P0ZTFrZmXH3EIl8M2gtZjHu6mWPTupx0szv65VxvqRl2ikiEDQ4 J1FJWyzjnhkNd21O9O63FLuCEVZtGHGfU0eDtSm4Om5PNlfNP+PBbAH/8woG7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652464724; a=rsa-sha256; cv=none; b=NGKV+qHYMa8WFBct+POcnJfHJ7v7+oviKK9q+114qZFLdKHLv/htjX77+w2P3Of+Vkd4e4 IwdK39+0usTgj/sxHApC9MBhvcjMLT/VnfPTf2Vi6FHbEBt0mmegM6Se5fSxvBc/0dGEYM njg4XO3uJNTgGeyEOdHhL6fUogF0uBFus+tTBnKhfeSCqBeA4sqCRXdHAbEX8cLLBu2ZLI qlvYbt0XjXwL6YwTFEsdsvB96wa9BxvdghKQ8AN+Neemia4ZMzianjZO7L0wMhnuCJ7H5O 3qwitzIYYBnxcgT6oOXq+lbPOyWJNEgFcZ83/HcGUhYKvfENAUSVJNH+ZNTtjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3fc514f4a7229492aeebda36494f1372b63f5cda commit 3fc514f4a7229492aeebda36494f1372b63f5cda Author: John Baldwin AuthorDate: 2022-04-08 00:01:27 +0000 Commit: John Baldwin CommitDate: 2022-05-13 17:43:31 +0000 otus: Return computed error value instead of ENXIO from otus_raw_xmit. (cherry picked from commit c0ca75b0db2fac9c4fd900a0ba8fe453c4c6156c) --- sys/dev/otus/if_otus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/otus/if_otus.c b/sys/dev/otus/if_otus.c index e1fac8b72fcb..cde1ad990ff9 100644 --- a/sys/dev/otus/if_otus.c +++ b/sys/dev/otus/if_otus.c @@ -566,7 +566,7 @@ error: otus_freebuf(sc, bf); OTUS_UNLOCK(sc); m_freem(m); - return (ENXIO); + return (error); } static void