From owner-svn-src-releng@freebsd.org Wed Sep 23 23:56:50 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BEE6E3E2C8A; Wed, 23 Sep 2020 23:56:50 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BxZpV4fPYz4Y4Y; Wed, 23 Sep 2020 23:56:50 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 82C611908D; Wed, 23 Sep 2020 23:56:50 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08NNuoOA017154; Wed, 23 Sep 2020 23:56:50 GMT (envelope-from erj@FreeBSD.org) Received: (from erj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08NNuoaO017152; Wed, 23 Sep 2020 23:56:50 GMT (envelope-from erj@FreeBSD.org) Message-Id: <202009232356.08NNuoaO017152@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: erj set sender to erj@FreeBSD.org using -f From: Eric Joyner Date: Wed, 23 Sep 2020 23:56:50 +0000 (UTC) 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 X-SVN-Group: releng X-SVN-Commit-Author: erj X-SVN-Commit-Paths: releng/12.2/sys/dev/e1000 X-SVN-Commit-Revision: 366097 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Sep 2020 23:56:50 -0000 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 #include #include +#ifdef RSS +#include +#include +#endif #include #include