From nobody Tue Feb 4 13:38:21 2025 X-Original-To: dev-commits-src-all@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 4YnPZj5VL3z5mqT0; Tue, 04 Feb 2025 13:38:21 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YnPZj3WNwz3t5G; Tue, 04 Feb 2025 13:38:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738676301; 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=X207W++ezoNRBO9BBilyH97+UGuclr8i0zSeNI0xGEA=; b=PKAcMtNVyfJhoUadpjCv8MJfekN+Z0HA6D7zQdHugwWeKhG+bUELrKgGG1M1o8wtgudPcU gF6IGSJkF0gviZ388RcaUOdxTSVqwav/VGls2SrPHE/teyaKljL4kBP5bAYCSxsQlZdn0Y I/UpTk/6YQEOcP+5B2tpkZXMqA3606PTJInNWcToaUAR2smgLGaLl05JY+Fw0fGSVc4542 0sLqaz96XhMERC7ZPHEKFfIExuax+pdOEMuIyyAMxNgEj1iiKd693oqChRiRSv4cSmk6sm cURfLVNuUq56fvVseUycuwgYyWK1M4+gn6Mz3Yl4cEeVgFk4wPS1+8IYrpcgBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738676301; 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=X207W++ezoNRBO9BBilyH97+UGuclr8i0zSeNI0xGEA=; b=L4m9h3COakr5q3kEB+oF0GYLuAonPSkTGNBhOrWMVx3Bsc/SQOR7QhErX+/4fmW/6rhK8/ /e3iMpW1uBZw0nzFenAywIGakZ/H5N7KMgHed1x6SBZNMTGHHm9A18yZ2DV0y3VCQMGaCE mj1YC2eZveUKxSMjlF15TwB5KlI+oOj8tztosiLtE5fQfoQNkK0ZIY2z8+zAPTnxGQZquH vjYks6CtLdZaDp4uEC3suK7oHyRkRRzHRHMpIpycCZPlczYju4ByXGTKbwX0NvPh2XOUO5 121B1q5o5j3aPPGvt7mhO0OgeQk44Yxc7Jbrh4kz9jhe4Bho/XQanmFBIUPRzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738676301; a=rsa-sha256; cv=none; b=SdM/yx2YQG+hn7t+eGnRTzSBsdONxQYBpNcZIAt7LDyg/H0U3TvdMhoqmo8D8ZjFK93iB0 MLR/ICGAl3GqYf8HEp6KpEyewKX6v+xRoWDsHpISXPA/GbUU8oID6adtOABO7EY7N52MRQ 6khHq/OJzgOhMdUkq7gcKsoM4/cBnv0Jq6MmlqXhnpEsFTzw/EYYHpJXhx/qFiAsNOdfYw 37g4subWkoFC5ERQS98tj+e3zkPYwUGoThW8fvd2SGPJW1TDaMw+Tl6aIKeDQBpk+7fQdd pgSB3VT9jBe/h85TjR/kp6hdzbqlwqxkoWFMTvU/vuSiCil8yHXtXBZJbhCsTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YnPZj36bsz1MsB; Tue, 04 Feb 2025 13:38:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 514DcLj5072531; Tue, 4 Feb 2025 13:38:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 514DcLbp072528; Tue, 4 Feb 2025 13:38:21 GMT (envelope-from git) Date: Tue, 4 Feb 2025 13:38:21 GMT Message-Id: <202502041338.514DcLbp072528@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 83c799af92eb - stable/14 - Revert "oce(4): deprecate" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 83c799af92eba2a9b8edb6560fcf760b9164a622 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=83c799af92eba2a9b8edb6560fcf760b9164a622 commit 83c799af92eba2a9b8edb6560fcf760b9164a622 Author: Ed Maste AuthorDate: 2025-01-27 16:54:20 +0000 Commit: Ed Maste CommitDate: 2025-02-04 13:38:09 +0000 Revert "oce(4): deprecate" These are reportedly still in fairly wide use. We strongly encourage folks with this hardware to post a dmesg on dmesgd.nycbug.org. This reverts commit 4591322980a37d6ee38a3ed70569366e16ca71f6. Discussed with: brooks Sponsored by: The FreeBSD Foundation (cherry picked from commit 8b012980b8cc5f8619cd552ee6df7b98b97c5d62) --- share/man/man4/oce.4 | 8 +------- sys/dev/oce/oce_if.c | 2 -- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/share/man/man4/oce.4 b/share/man/man4/oce.4 index 47b09cdd7136..a8cd9ae80734 100644 --- a/share/man/man4/oce.4 +++ b/share/man/man4/oce.4 @@ -34,7 +34,7 @@ .\" 3333 Susan Street .\" Costa Mesa, CA 92626 .\" -.Dd June 13, 2023 +.Dd January 27, 2025 .Dt OCE 4 .Os .Sh NAME @@ -55,12 +55,6 @@ module at boot time, place the following line in .Bd -literal -offset indent if_oce_load="YES" .Ed -.Sh DEPRECATION NOTICE -The -.Nm -driver may not be present in -.Fx 15.0 -and later. .Sh DESCRIPTION Emulex OneConnect adapters come in various skews and with different combinations of NIC, FCoE and iSCSI functions. diff --git a/sys/dev/oce/oce_if.c b/sys/dev/oce/oce_if.c index bf257b952a03..8a21cca81966 100644 --- a/sys/dev/oce/oce_if.c +++ b/sys/dev/oce/oce_if.c @@ -370,8 +370,6 @@ oce_attach(device_t dev) } softc_tail = sc; - gone_in_dev(dev, 15, "relatively uncommon 10GbE NIC"); - return 0; stats_free: