From nobody Thu Aug 24 20:51:56 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 4RWwHc4G4vz4rYtq; Thu, 24 Aug 2023 20:51:56 +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 4RWwHc3mSSz3PfZ; Thu, 24 Aug 2023 20:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692910316; 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=vKHnIfIL6xACQ1ubifzr7RY7XDQHbXraeZVAh6ukOVk=; b=SYMnlvA0wUsveWs7p+sDsX51x8KAgq20Jc9WlTEV+L/n3AtRoaR91zyrECxsAlEP75Nx7D F2ScpklW79lhEShQ/+IgeNacEhST96dJTRHNB/3ppladSlYATdY7Frmc6lJVLY2ZarjJKe o1mb37hTtfA70Mfbva/oR9lWYiqiwT8wmRX4WsOMTTgNM3nFJFrMRgQBPdtWgIyNJWdAXI 9I4dHhIEKIRjC3NaMqvmKPlgOAP8Tl+PUjygDVwFq6j1/bN6DwXdQOM2RLNWvsDpvimm1w cg6J5KX4uzzuiMqXpFkPzOcXJF0Vfi/JVPflxg3JnDVCqO3CoSnuUIvP/GPOEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692910316; 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=vKHnIfIL6xACQ1ubifzr7RY7XDQHbXraeZVAh6ukOVk=; b=SFcb1DLj+em1EIcR5A4tVVl4hNJRbKVh4ztXKy5QchRjGHS5/Uz2jr0dbjBa1vbVV6ftB9 8Aw7rWcn9oClN5fjxVFG4DQ4lCjlVzPt8Xha+VuDoDR5NxRCf4TuyIE/A12ftHqvfxzhge Dcq902SH217OLUCUDUis9E33chVH2i9MTPAF+SGkFPkvxNmHe8Tun3DIVCzS1uSHxVy/cc CeBZ7H5fzm13vF9PK4YkdYNN8CslohjbvypDy1iSjC0YB8pbJKYL5DtarAIhpR90S1D7ZS 4FlIdElv3NDBQ7WMo56Al4TMP57OipAJI0v0GgE8YooLPrSxEACyWmFGGgF6ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692910316; a=rsa-sha256; cv=none; b=dfUgBWAn9+o8OsGEbEvHq9csfmmyfIv385aIvntSxc1uwPJx5/mNUfHVcdZCv0jfWJHY5T zQGrSk6/PaM61SDVlSe7Lw2YM5UdAlHkSD35hI/SEjN5a+w3O5fQvZr1r3zR9au/uFGU6e z5SdxjGEIhIQQK6s1EZ9M93r8EYrtteasJGm9Y3pBAck+4O9zU53mLHfBmXKxtOn0hL7rT hoAF8bTQgDTThnUhaq6TiY2AARt+b4QmtSQHxHnN+ORtq7U2TjpFn7mAdn7O+4D8JqptnM 1jy9UjpK2H2N2aYz6Urj8g7NZkRQL5cqmrdlFT8dqZCbug0Mx2VOWhnaDv9muA== 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 4RWwHc2qKXzh5l; Thu, 24 Aug 2023 20:51:56 +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 37OKpuXv039366; Thu, 24 Aug 2023 20:51:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OKpuDm039363; Thu, 24 Aug 2023 20:51:56 GMT (envelope-from git) Date: Thu, 24 Aug 2023 20:51:56 GMT Message-Id: <202308242051.37OKpuDm039363@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: bce864d1c274 - main - bnxt: 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: bce864d1c274faeb6678028aad1e07e91fe430ac Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=bce864d1c274faeb6678028aad1e07e91fe430ac commit bce864d1c274faeb6678028aad1e07e91fe430ac Author: Kevin Bowling AuthorDate: 2023-08-24 20:16:24 +0000 Commit: Kevin Bowling CommitDate: 2023-08-24 20:46:56 +0000 bnxt: 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 is unintentional for bnxt(4) and is causing another bug in its VLAN initialization code to affect the common case of adding and removing VLANs on an existing interface. PR: 269133 Tested by: kp MFC after: 2 weeks Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D41558 --- sys/dev/bnxt/if_bnxt.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/dev/bnxt/if_bnxt.c b/sys/dev/bnxt/if_bnxt.c index 2796eed94e11..25715756ce29 100644 --- a/sys/dev/bnxt/if_bnxt.c +++ b/sys/dev/bnxt/if_bnxt.c @@ -224,6 +224,7 @@ static uint8_t get_phy_type(struct bnxt_softc *softc); static uint64_t bnxt_get_baudrate(struct bnxt_link_info *link); static void bnxt_get_wol_settings(struct bnxt_softc *softc); static int bnxt_wol_config(if_ctx_t ctx); +static bool bnxt_if_needs_restart(if_ctx_t, enum iflib_restart_event); /* * Device Interface Declaration @@ -288,6 +289,8 @@ static device_method_t bnxt_iflib_methods[] = { DEVMETHOD(ifdi_shutdown, bnxt_shutdown), DEVMETHOD(ifdi_resume, bnxt_resume), + DEVMETHOD(ifdi_needs_restart, bnxt_if_needs_restart), + DEVMETHOD_END }; @@ -2497,6 +2500,16 @@ bnxt_wol_config(if_ctx_t ctx) return 0; } +static bool +bnxt_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 bnxt_shutdown(if_ctx_t ctx) {