svn commit: r247424 - stable/9/sys/net

[John Baldwin]

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,