From owner-svn-src-all@freebsd.org Thu May 16 18:00:18 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D15CC15A22B4; Thu, 16 May 2019 18:00:18 +0000 (UTC) (envelope-from brooks@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 736A26BA16; Thu, 16 May 2019 18:00:18 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4E3BB244F6; Thu, 16 May 2019 18:00:18 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4GI0Ioi022854; Thu, 16 May 2019 18:00:18 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4GI0HAr022852; Thu, 16 May 2019 18:00:17 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201905161800.x4GI0HAr022852@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Thu, 16 May 2019 18:00:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r347848 - in stable/12/sys/dev: ae dme X-SVN-Group: stable-12 X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: in stable/12/sys/dev: ae dme X-SVN-Commit-Revision: 347848 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 736A26BA16 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.974,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 May 2019 18:00:19 -0000 Author: brooks Date: Thu May 16 18:00:17 2019 New Revision: 347848 URL: https://svnweb.freebsd.org/changeset/base/347848 Log: MFC r347365, r347703 r347365: Update dme(4) to reflect that it will not be removed due to FCP-101. dme(4) is the built-in NIC on a couple non-expandable mips platforms and thus should remain. The FCP has been updated to reflect this fact. Discussed with: imp r347703: FCP-101: ae(4) is sufficently popular to be moved to the keep list. Modified: stable/12/sys/dev/ae/if_ae.c stable/12/sys/dev/dme/if_dme.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/ae/if_ae.c ============================================================================== --- stable/12/sys/dev/ae/if_ae.c Thu May 16 17:59:43 2019 (r347847) +++ stable/12/sys/dev/ae/if_ae.c Thu May 16 18:00:17 2019 (r347848) @@ -396,8 +396,6 @@ ae_attach(device_t dev) goto fail; } - gone_by_fcp101_dev(dev); - fail: if (error != 0) ae_detach(dev); Modified: stable/12/sys/dev/dme/if_dme.c ============================================================================== --- stable/12/sys/dev/dme/if_dme.c Thu May 16 17:59:43 2019 (r347847) +++ stable/12/sys/dev/dme/if_dme.c Thu May 16 18:00:17 2019 (r347848) @@ -916,8 +916,6 @@ dme_attach(device_t dev) goto fail; } - gone_by_fcp101_dev(dev); - fail: if (error != 0) dme_detach(dev);