From owner-svn-src-head@FreeBSD.ORG  Tue Oct  2 12:25:31 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 46D0B106566B;
	Tue,  2 Oct 2012 12:25:31 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3172C8FC08;
	Tue,  2 Oct 2012 12:25:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q92CPVG5036192;
	Tue, 2 Oct 2012 12:25:31 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q92CPUEW036190;
	Tue, 2 Oct 2012 12:25:31 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201210021225.q92CPUEW036190@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 2 Oct 2012 12:25:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r241130 - head/sys/net
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Oct 2012 12:25:31 -0000

Author: jhb
Date: Tue Oct  2 12:25:30 2012
New Revision: 241130
URL: http://svn.freebsd.org/changeset/base/241130

Log:
  Rename the module for 'device enc' to "if_enc" to avoid conflicting with
  the CAM "enc" peripheral (part of ses(4)).  Previously the two modules
  used the same name, so only one was included in a linked kernel causing
  enc0 to not be created if you added IPSEC to GENERIC.  The new module
  name follows the pattern of other network interfaces (e.g. "if_loop").
  
  MFC after:	1 week

Modified:
  head/sys/net/if_enc.c

Modified: head/sys/net/if_enc.c
==============================================================================
--- head/sys/net/if_enc.c	Tue Oct  2 12:03:02 2012	(r241129)
+++ head/sys/net/if_enc.c	Tue Oct  2 12:25:30 2012	(r241130)
@@ -179,12 +179,12 @@ enc_modevent(module_t mod, int type, voi
 }
 
 static moduledata_t enc_mod = {
-	"enc",
+	"if_enc",
 	enc_modevent,
 	0
 };
 
-DECLARE_MODULE(enc, enc_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY);
+DECLARE_MODULE(if_enc, enc_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY);
 
 static int
 enc_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,