From nobody Mon Jan 27 17:06:44 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 4YhZZs0bXmz5lxwQ; Mon, 27 Jan 2025 17:06:45 +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 4YhZZr6xfQz3bP6; Mon, 27 Jan 2025 17:06:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737997605; 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=v6mpHWHKBB3f8HY+/myPza7ETmo7beoS8Kr1qWjVqAg=; b=c6YdAKQVYya15tXDygFc7mWw9sBcVSBg8oJ78iTi8yT2DcEC1MpmCVAsYWc8W2to51Ojjk va/11JPeg+uiIPviGRz7XqKVr8ib2kacR03ShgGUqMpDgQx6dz/lw+9rJ5ILPeOv4k1WoA 82iQlyB4i8953BQHjfPt6cl6pHsyMno3ubvio56J4un6mkkT6VYAXRSbVSp0I8hn+CkXiv 2z4dzYAe643O3QnCSxNoy0JTDv9VtbQl/LA+1Aph+msdNMVnFVJMaHs7regEYWD39FqmBc Y9nLLeIJNGqSjDx1yPQkzkbvJ4v/r6ga3VduxiZFBLDRzXnttIaU2t1Eigo2wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737997605; 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=v6mpHWHKBB3f8HY+/myPza7ETmo7beoS8Kr1qWjVqAg=; b=qZrraMSCxP7fyJ2CWxsnBmU6lmDYJJEsAU1QCFIbjwqRo1FxXgk8pOQf1p1bkp053EmoH8 IlW+Jjc84xVFj1jhuB0hnUIycG9/AhRIOPHI7Z56izyrWKWpN4Up3s4qRS2RmCwx2br/Mi UqSXd5aD84BMw6A2RaAhMYjgFbf8+fRMBn1x/Nlk8x8EkVKHZM4h0V7ESIT6KufgoEqtvu ZlleF4kgkCTeScDowPcIFRQoykZxA8Hw/92xyze/kkOJPCSpbIUOjY3uIeAMmhToN2q6VQ sTMYgW54jms8qMyZ97DpLo+ayom7807vQPTj3vFZrryyBIMmnU+aLCsXK7bnjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737997605; a=rsa-sha256; cv=none; b=GZakDiN3P1XfhOKyBXlUwSe2qaXR0+rlaqo+L44iCqyiQumoc2v3Xh8tohdMPvpZZB8nod iOqumjS58TOVLEFmTmflPAKSKMcN28y3YUVp187auAE93xwaJNfdXtgMip4ZS12lZc53UP jqtmbL6fYDiwBeZdpmWWLiU+HNJ2SJN31NFbwPSicxuR70SGBggrMYMwD0tAFxtDmuUhh3 r51V6norUhx0vmpAVd37yzxJc2UlCU4bO/uRhkCkBqxl90XQ8yMhaDp2D9PnUVYwSzyYJB 3M+EtSXMcqCg/BS8SnNIMw0hxIkTbItcPzfEtqOL3LLx1Cxq+hrwWEQ9e3Ck9Q== 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 4YhZZr69YwzdW2; Mon, 27 Jan 2025 17:06:44 +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 50RH6i9b060617; Mon, 27 Jan 2025 17:06:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50RH6ikv060614; Mon, 27 Jan 2025 17:06:44 GMT (envelope-from git) Date: Mon, 27 Jan 2025 17:06:44 GMT Message-Id: <202501271706.50RH6ikv060614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 8b012980b8cc - main - 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/main X-Git-Reftype: branch X-Git-Commit: 8b012980b8cc5f8619cd552ee6df7b98b97c5d62 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8b012980b8cc5f8619cd552ee6df7b98b97c5d62 commit 8b012980b8cc5f8619cd552ee6df7b98b97c5d62 Author: Ed Maste AuthorDate: 2025-01-27 16:54:20 +0000 Commit: Ed Maste CommitDate: 2025-01-27 17:06:21 +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 --- 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 14dd5cf34a7a..1906933fa75a 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: