From owner-svn-src-all@freebsd.org Sat Jul 25 03:49:34 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9EA1A37C3EB; Sat, 25 Jul 2020 03:49:34 +0000 (UTC) (envelope-from nyan@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BDBsB3pRnz4fLg; Sat, 25 Jul 2020 03:49:34 +0000 (UTC) (envelope-from nyan@FreeBSD.org) Received: from localhost (sakura.ccs.furiru.org [IPv6:2001:2f0:104:8060::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: nyan/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 2B6782C6C5; Sat, 25 Jul 2020 03:49:32 +0000 (UTC) (envelope-from nyan@FreeBSD.org) Date: Sat, 25 Jul 2020 12:49:11 +0900 (JST) Message-Id: <20200725.124911.256350108759170094.nyan@FreeBSD.org> To: erj@FreeBSD.org Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r362063 - head/sys/dev/e1000 From: Yoshihiro Takahashi In-Reply-To: <202006111559.05BFxnSa070435@repo.freebsd.org> References: <202006111559.05BFxnSa070435@repo.freebsd.org> X-Mailer: Mew version 6.8 on Emacs 26.3 Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 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: Sat, 25 Jul 2020 03:49:34 -0000 Please merge this change to stable/12 branch until a proper fix is done. --- Yoshihiro Takahashi In article <202006111559.05BFxnSa070435@repo.freebsd.org> Eric Joyner writes: > Author: erj > Date: Thu Jun 11 15:59:49 2020 > New Revision: 362063 > URL: https://svnweb.freebsd.org/changeset/base/362063 > > Log: > em(4): Always reinit interface when adding/removing VLAN > > This partially reverts r361053 since there have been reports > by users that this breaks some functionality for em(4) > devices; it seems at first glance that some sort of interface > restart is required for those cards. > > This isn't a proper fix; this unbreaks those users until a proper > fix is found for their issues. > > PR: 240818 > Reported by: Marek Zarychta > MFC after: 3 days > > Modified: > head/sys/dev/e1000/if_em.c > > Modified: head/sys/dev/e1000/if_em.c > ============================================================================== > --- head/sys/dev/e1000/if_em.c Thu Jun 11 15:17:13 2020 (r362062) > +++ head/sys/dev/e1000/if_em.c Thu Jun 11 15:59:49 2020 (r362063) > @@ -4059,7 +4059,6 @@ em_if_needs_restart(if_ctx_t ctx __unused, enum iflib_ > { > switch (event) { > case IFLIB_RESTART_VLAN_CONFIG: > - return (false); > default: > return (true); > }