From nobody Mon Sep 11 22:35:36 2023 X-Original-To: dev-commits-src-branches@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 4Rl1kw3QFCz4sTZY; Mon, 11 Sep 2023 22:35:36 +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 4Rl1kw2Rlsz3ft6; Mon, 11 Sep 2023 22:35:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694471736; 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=fgtJxoJSV+iIOT5HbsYCIHcQeUrG2seKCJEJvpqQ1tM=; b=rMCK6osaPJDO2a5wGw2NoW6zavkTj7amet8tGZK3Ab27BUM+ojET6aIPrTx0NNAOvJS+Iv fKCSiT7YdKAp+aLtZdyOLU86D1DOAxz3YsYtBc9mqz7KYheHku4kGsqkBMTDaCiQx8BeRp 82idWeHP9j36DsXcSWliUPN0bLXwnPQZSr6VdoyfJ3knbm3GvFblZUHjofciXA9Nz2V6hB Byu7fdSGXVe0fGDWZeSBS+mrWLB8NPv8AzZwn/MjiLfD5f5UBMRqs5MV3hs5yst8PuxWYC eTv1mbXDTbWqKpRnjoZ8Bh0WC2zadveWAAyqwmWWo39sXKPWe3+LH8C+9qk8Wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694471736; a=rsa-sha256; cv=none; b=nY2ZwHPezUU+GOWYzaNLPoXpYZn7FT6p3aYTiBLTEmkmjwDS2hh9B85fYfCCI46+UDyU5F gIVFBrA7Gb5epDLNLt0JtOdRtXQmiG48fnOmwhuzk5YNOGvFjXK32WlE318HRjCy26Kz0t 57tqtbo/PCcOQsGjnN++KTpO8+q4CW26y2zqXcY3QAkdjwKhOxu3vgJ7ZWjZmip9jUYBvG o28bmTz8/zBomKgiGquhFfYKuc+pnhFEjlE9RtgGydwhxugFUcV3qe3QgGhKORmzHMBDHf g7ED+FjjDEIyZQxcE0L6lqdQaP4ccV9eenW39dMRc7vvDi+Fs790ifAyNKxosQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694471736; 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=fgtJxoJSV+iIOT5HbsYCIHcQeUrG2seKCJEJvpqQ1tM=; b=VTqmwqTOad5UIAhixDXrr77LwRUyUuXpdJu3WDyQVg6Zmd4Js8kMKtBtVlbXl6nBlJp2lG +ze57ZhGHkpq3L6rIZRLryE5D7AnPdM7n/u1doQffI8l+G3LyuDMPq0DHh9xYy4R4FAcgZ tAsUW5GB8ZqqUzKj/tObvcYTUHEb13cBFmsIqfPEALUW4k+UkMpR4Tz0+qXxPFMsskIEaq /AIJ/EV1nqZfYARscF58To75TXlfzVzlossGmMDHjxLEFQwO9i9l9NeuCbJjKgKyQEQgnk yUZ61GWTNGpn5vyyjaFleuJy47OzRCA0INNFs/hIsClQCz9ukwqkL0wbOA/5Dw== 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 4Rl1kw1VfMz168r; Mon, 11 Sep 2023 22:35:36 +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 38BMZaF7056830; Mon, 11 Sep 2023 22:35:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BMZax9056827; Mon, 11 Sep 2023 22:35:36 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:35:36 GMT Message-Id: <202309112235.38BMZax9056827@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: ca3fc7aabe39 - stable/13 - bnxt: Don't restart on VLAN changes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: ca3fc7aabe3998822c6e1357df922618afb18648 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=ca3fc7aabe3998822c6e1357df922618afb18648 commit ca3fc7aabe3998822c6e1357df922618afb18648 Author: Kevin Bowling AuthorDate: 2023-08-24 20:16:24 +0000 Commit: Kevin Bowling CommitDate: 2023-09-11 22:34:20 +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 Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D41558 (cherry picked from commit bce864d1c274faeb6678028aad1e07e91fe430ac) --- 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 2eb41cf7ade8..db8b4125e5bd 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) {