Date: Wed, 23 Sep 2020 23:56:50 +0000 (UTC) From: Eric Joyner <erj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r366097 - releng/12.2/sys/dev/e1000 Message-ID: <202009232356.08NNuoaO017152@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: erj Date: Wed Sep 23 23:56:49 2020 New Revision: 366097 URL: https://svnweb.freebsd.org/changeset/base/366097 Log: MFS r365983 Contains fixes for issues in em(4)/igb(4): - Fix define and includes with RSS option enabled - Properly retain promisc flag in init PR: 249191, 248869 Approved by: re (gjb@) Modified: releng/12.2/sys/dev/e1000/if_em.c releng/12.2/sys/dev/e1000/if_em.h Directory Properties: releng/12.2/ (props changed) Modified: releng/12.2/sys/dev/e1000/if_em.c ============================================================================== --- releng/12.2/sys/dev/e1000/if_em.c Wed Sep 23 22:49:27 2020 (r366096) +++ releng/12.2/sys/dev/e1000/if_em.c Wed Sep 23 23:56:49 2020 (r366097) @@ -1338,7 +1338,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 */ Modified: releng/12.2/sys/dev/e1000/if_em.h ============================================================================== --- releng/12.2/sys/dev/e1000/if_em.h Wed Sep 23 22:49:27 2020 (r366096) +++ releng/12.2/sys/dev/e1000/if_em.h Wed Sep 23 23:56:49 2020 (r366097) @@ -30,6 +30,7 @@ #include "opt_ddb.h" #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_rss.h" #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -69,6 +70,10 @@ #include <net/if_dl.h> #include <net/if_media.h> #include <net/iflib.h> +#ifdef RSS +#include <net/rss_config.h> +#include <netinet/in_rss.h> +#endif #include <net/if_types.h> #include <net/if_vlan_var.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009232356.08NNuoaO017152>