svn commit: r365983 - stable/12/sys/dev/e1000

[Eric Joyner]

Author: erj
Date: Mon Sep 21 22:52:57 2020
New Revision: 365983
URL: https://svnweb.freebsd.org/changeset/base/365983

Log:
  MFC r365774 and r365776
  
  These two commits fix issues in em(4)/igb(4):
  - Fix define and includes with RSS option enabled
  - Properly retain promisc flag in init
  
  PR:		249191, 248869
  MFC after:	1 day

Modified:
  stable/12/sys/dev/e1000/if_em.c
  stable/12/sys/dev/e1000/if_em.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/e1000/if_em.c
==============================================================================
--- stable/12/sys/dev/e1000/if_em.c	Mon Sep 21 22:24:46 2020	(r365982)
+++ stable/12/sys/dev/e1000/if_em.c	Mon Sep 21 22:52:57 2020	(r365983)
@@ -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: stable/12/sys/dev/e1000/if_em.h
==============================================================================
--- stable/12/sys/dev/e1000/if_em.h	Mon Sep 21 22:24:46 2020	(r365982)
+++ stable/12/sys/dev/e1000/if_em.h	Mon Sep 21 22:52:57 2020	(r365983)
@@ -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>