From owner-svn-src-all@freebsd.org  Sat Mar  3 10:15:37 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E095DF2D769;
 Sat,  3 Mar 2018 10:15:37 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 907B978E32;
 Sat,  3 Mar 2018 10:15:37 +0000 (UTC)
 (envelope-from eadler@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 8A6DC24F0E;
 Sat,  3 Mar 2018 10:15:37 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w23AFb57020684;
 Sat, 3 Mar 2018 10:15:37 GMT (envelope-from eadler@FreeBSD.org)
Received: (from eadler@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w23AFb0N020683;
 Sat, 3 Mar 2018 10:15:37 GMT (envelope-from eadler@FreeBSD.org)
Message-Id: <201803031015.w23AFb0N020683@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: eadler set sender to
 eadler@FreeBSD.org using -f
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sat, 3 Mar 2018 10:15:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r330316 - stable/11/etc
X-SVN-Group: stable-11
X-SVN-Commit-Author: eadler
X-SVN-Commit-Paths: stable/11/etc
X-SVN-Commit-Revision: 330316
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Mar 2018 10:15:38 -0000

Author: eadler
Date: Sat Mar  3 10:15:37 2018
New Revision: 330316
URL: https://svnweb.freebsd.org/changeset/base/330316

Log:
  MFC r313276:
  
  Use kldload -n when loading if_deqna
  
  This fixes if_deqna from being loaded by accident twice if it's already loaded
  in the kernel.

Modified:
  stable/11/etc/devd.conf
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/etc/devd.conf
==============================================================================
--- stable/11/etc/devd.conf	Sat Mar  3 10:01:12 2018	(r330315)
+++ stable/11/etc/devd.conf	Sat Mar  3 10:15:37 2018	(r330316)
@@ -272,7 +272,7 @@ nomatch 10 {
 	match "bus" "pccard[0-9]+";
 	match "manufacturer" "0x1234";
 	match "product" "0x2323";
-	action "kldload if_deqna";
+	action "kldload -n if_deqna";
 };
 attach 10 {
 	device-name "deqna[0-9]+";