summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2012-10-02 12:25:30 +0000
committerjhb <jhb@FreeBSD.org>2012-10-02 12:25:30 +0000
commitaa29abaca0ee9a5160d0b057e8c2fc51e2085707 (patch)
tree7dae3c9ced6c76f90e703294a7bc5f5931cc318e
parenta73c365c3b7a51e662010c36af75a21348fd4284 (diff)
downloadFreeBSD-src-aa29abaca0ee9a5160d0b057e8c2fc51e2085707.zip
FreeBSD-src-aa29abaca0ee9a5160d0b057e8c2fc51e2085707.tar.gz
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
-rw-r--r--sys/net/if_enc.c4
1 files 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,
OpenPOWER on IntegriCloud