Date: Tue, 15 Sep 2020 21:07:30 +0000 (UTC) From: Eric Joyner <erj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365776 - head/sys/dev/e1000 Message-ID: <202009152107.08FL7UiO022143@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: erj Date: Tue Sep 15 21:07:30 2020 New Revision: 365776 URL: https://svnweb.freebsd.org/changeset/base/365776 Log: e1000: Properly retain promisc flag From Franco: The iflib rewrite forced the promisc flag but it was not reported to the system. Noticed on a stock VM that went into unsolicited promisc mode when dhclient was started during bootup. PR: 248869 Submitted by: Franco Fichtner <franco@opnsense.org> Reviewed by: erj@ 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 Tue Sep 15 21:04:27 2020 (r365775) +++ head/sys/dev/e1000/if_em.c Tue Sep 15 21:07:30 2020 (r365776) @@ -1342,7 +1342,7 @@ em_if_init(if_ctx_t ctx) } /* Don't lose promiscuous settings */ - em_if_set_promisc(ctx, IFF_PROMISC); + em_if_set_promisc(ctx, if_getflags(ifp)); e1000_clear_hw_cntrs_base_generic(&adapter->hw); /* MSI-X configuration for 82574 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009152107.08FL7UiO022143>