From 97f844cd60ddb0b56fa4ed0977620fd0cd7e15b0 Mon Sep 17 00:00:00 2001
From: Eric Joyner <erj@FreeBSD.org>
Date: Wed, 23 Sep 2020 23:56:49 +0000
Subject: [PATCH] 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@)
---
 sys/dev/e1000/if_em.c | 2 +-
 sys/dev/e1000/if_em.h | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c
index 558a75ac015..42faacfc3ee 100644
--- a/sys/dev/e1000/if_em.c
+++ b/sys/dev/e1000/if_em.c
@@ -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 */
diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h
index bfc1b3f2a11..efad9251105 100644
--- a/sys/dev/e1000/if_em.h
+++ b/sys/dev/e1000/if_em.h
@@ -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>
-- 
2.45.0