aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Joyner <erj@FreeBSD.org>2020-09-23 23:56:49 +0000
committerEric Joyner <erj@FreeBSD.org>2020-09-23 23:56:49 +0000
commit97f844cd60ddb0b56fa4ed0977620fd0cd7e15b0 (patch)
tree927afad79db935eadbebc088e4b07a1b6e29eb39
parent370e97a40767c5a1dc09e78e406d9f05ebde6d94 (diff)
downloadsrc-97f844cd60ddb0b56fa4ed0977620fd0cd7e15b0.tar.gz
src-97f844cd60ddb0b56fa4ed0977620fd0cd7e15b0.zip
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@)
Notes
Notes: svn path=/releng/12.2/; revision=366097
-rw-r--r--sys/dev/e1000/if_em.c2
-rw-r--r--sys/dev/e1000/if_em.h5
2 files changed, 6 insertions, 1 deletions
diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c
index 558a75ac015e..42faacfc3eea 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 bfc1b3f2a118..efad9251105b 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>