svn commit: r241130 - head/sys/net

[John Baldwin]

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,