From aa29abaca0ee9a5160d0b057e8c2fc51e2085707 Mon Sep 17 00:00:00 2001 From: jhb Date: Tue, 2 Oct 2012 12:25:30 +0000 Subject: 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 --- sys/net/if_enc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c index 9506172..cc516d7 100644 --- a/sys/net/if_enc.c +++ b/sys/net/if_enc.c @@ -179,12 +179,12 @@ enc_modevent(module_t mod, int type, void *data) } 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, -- cgit v1.1