svn commit: r362063 - head/sys/dev/e1000

[Eric Joyner]

Done in r363711. I apologize for it taking so long.

On Fri, Jul 24, 2020 at 8:49 PM Yoshihiro Takahashi <nyan at freebsd.org>
wrote:

> Please merge this change to stable/12 branch until a proper fix is
> done.
>
> ---
> Yoshihiro Takahashi <nyan at FreeBSD.org>
>
> In article <202006111559.05BFxnSa070435 at repo.freebsd.org>
> Eric Joyner <erj at FreeBSD.org> 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 <zarychtam at plan-b.pwste.edu.pl>
> >   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);
> >       }
>