From owner-svn-src-stable@FreeBSD.ORG  Wed Feb 27 22:08:18 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A23B9C00;
 Wed, 27 Feb 2013 22:08:18 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9444B3A7;
 Wed, 27 Feb 2013 22:08:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1RM8I3o023023;
 Wed, 27 Feb 2013 22:08:18 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1RM8I1M023022;
 Wed, 27 Feb 2013 22:08:18 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201302272208.r1RM8I1M023022@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 27 Feb 2013 22:08:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r247424 - stable/9/sys/net
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Feb 2013 22:08:18 -0000

Author: jhb
Date: Wed Feb 27 22:08:18 2013
New Revision: 247424
URL: http://svnweb.freebsd.org/changeset/base/247424

Log:
  MFC 241130:
  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").

Modified:
  stable/9/sys/net/if_enc.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/net/if_enc.c
==============================================================================
--- stable/9/sys/net/if_enc.c	Wed Feb 27 22:02:40 2013	(r247423)
+++ stable/9/sys/net/if_enc.c	Wed Feb 27 22:08:18 2013	(r247424)
@@ -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,