From nobody Thu Aug 24 20:51:57 2023 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 4RWwHd5qB6z4rYxx; Thu, 24 Aug 2023 20:51:57 +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 4RWwHd4z5bz3PjV; Thu, 24 Aug 2023 20:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692910317; 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=D5dwfJimSqRmMDlKD34GA0cvQq7oK2V+yiXYNNDsjC4=; b=jMe5SP/Wv7KGrlWpU9wifGcRI3BE5hlrK8cr4MVbit7ALi3DTYwCFGWgh9InBtc2iT+smm f0gV7zmwnGuevQEHxdxl5IxgaIDJuJ3PUU7WQRw7BMT0o0jYF03eUxraQDqn1GA7TIiZdB KAq8rSpxHSKgcoVE+K3BaV96H/TbWYAM0DgoKQq5us61fQbjLPTJdHI21k7xQW+9x1AyAA k2WJhL9KdaXB5UWo6LxpjRx2ZQqt6bBt+Gr6Z7NU+2m/j78Sn5S2TzQYFl/RetzZ/xMJNJ m+iRvk96NtISUCx9IFI4EqaMaXp0KLroWJi02MD/hWnO4AKhXgFzou3rb1/dEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692910317; 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=D5dwfJimSqRmMDlKD34GA0cvQq7oK2V+yiXYNNDsjC4=; b=EahmQU91KPfKwnKkVUCHl0QuKbldEmAP0iDjgg23iq3mhP40P7971uRm8EqRdqCtiyCJew j+EjePN2zHrVSRRrTnGhiCvIKxJOc/vJyBBoqDMWExKSppqyNx0r8m5eMpYDSDW/YI5ew1 JgQzd5tmgeE2EmvvAjZ+6c2jfV4PiVBLkMXpt0gYX+lpu7XOvxZ3ocVIXRbEcUzPl7dXs8 69RePaLGUZOCFVnTPe+M5c/522iPTTWzsqiaY85IoFjjWRmAmTflYF4MAJAUmdLs/A8fqI fEf0EZ0U9e19+ycmVdyYvH5q7OZCIOExZfZbjEhFzyiOqeTwxDkM0qyK3z4bhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692910317; a=rsa-sha256; cv=none; b=uQQn7bRcdmmEJyBWgb6vmbgRFR1zt0LHaqEIuT1WDuxWij7fy0seerY+2ZosQz7vYze0dr FhzFTiH6pqX/4ZLAt8ofBF20hqMeR4lbG20ZAuRtCu+U6p+1PIW2lrxDeUlazTqjkgF+pK yOg/U13NKVqaC5xPiiDWxeNgt048GDjVkCLCzM6Db+VLwXnZWnoWQmCEKI4+Mx8vBFZzNx 7EKUjC5cNf7Fbzqiup3lxOAhz7zK11KxAHD69qc2QRT2ucTqfiWA61ID3bRH1YM+yflz4T Q4X+SOvgwXhLhIWg5ESEpG0ZcciojB7G67y42lp+gXh2DXaQsXetj52lWnCtDQ== 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 4RWwHd3rzRzhwx; Thu, 24 Aug 2023 20:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OKpv9N039411; Thu, 24 Aug 2023 20:51:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OKpvg2039408; Thu, 24 Aug 2023 20:51:57 GMT (envelope-from git) Date: Thu, 24 Aug 2023 20:51:57 GMT Message-Id: <202308242051.37OKpvg2039408@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: f9e0a790ae44 - main - enetc: Don't restart on VLAN changes 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f9e0a790ae441f649cc9ff2538dc3a2b2a0a0cb4 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=f9e0a790ae441f649cc9ff2538dc3a2b2a0a0cb4 commit f9e0a790ae441f649cc9ff2538dc3a2b2a0a0cb4 Author: Kevin Bowling AuthorDate: 2023-08-24 20:24:48 +0000 Commit: Kevin Bowling CommitDate: 2023-08-24 20:46:56 +0000 enetc: Don't restart on VLAN changes In rS360398, a new iflib device method was added with default of opt out for VLAN events needing an interface reset. This re-init is unintentional for enetc(4). MFC after: 2 weeks Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D41558 --- sys/dev/enetc/if_enetc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/dev/enetc/if_enetc.c b/sys/dev/enetc/if_enetc.c index 04171698cd38..ec703c09ba77 100644 --- a/sys/dev/enetc/if_enetc.c +++ b/sys/dev/enetc/if_enetc.c @@ -96,6 +96,7 @@ static int enetc_mtu_set(if_ctx_t, uint32_t); static void enetc_setup_multicast(if_ctx_t); static void enetc_timer(if_ctx_t, uint16_t); static void enetc_update_admin_status(if_ctx_t); +static bool enetc_if_needs_restart(if_ctx_t, enum iflib_restart_event); static miibus_readreg_t enetc_miibus_readreg; static miibus_writereg_t enetc_miibus_writereg; @@ -202,6 +203,8 @@ static device_method_t enetc_iflib_methods[] = { DEVMETHOD(ifdi_timer, enetc_timer), DEVMETHOD(ifdi_update_admin_status, enetc_update_admin_status), + DEVMETHOD(ifdi_needs_restart, enetc_if_needs_restart), + DEVMETHOD_END }; @@ -1410,6 +1413,16 @@ enetc_update_admin_status(if_ctx_t ctx) } } +static bool +enetc_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) +{ + switch (event) { + case IFLIB_RESTART_VLAN_CONFIG: + default: + return (false); + } +} + static int enetc_miibus_readreg(device_t dev, int phy, int reg) {