- Express hard dependencies on bus (pci, isa, pccard) and

  network layer (ether).
- Don't abuse module names to facilitate ifconfig module loading;
  such abuse isn't really needed.  (And if we do need type information
  associated with a module then we should make it explicit and not
  use hacks.)

3 files changed, 9 insertions, 6 deletions

diff --git a/sys/dev/an/if_an_isa.c b/sys/dev/an/if_an_isa.c
index 0dd709a..f4ee9be 100644
--- a/sys/dev/an/if_an_isa.c
+++ b/sys/dev/an/if_an_isa.c
@@ -166,5 +166,6 @@ static driver_t an_isa_driver = {
 
 static devclass_t an_isa_devclass;
 
-DRIVER_MODULE(if_an, isa, an_isa_driver, an_isa_devclass, 0, 0);
-MODULE_DEPEND(if_an, wlan, 1, 1, 1);
+DRIVER_MODULE(an, isa, an_isa_driver, an_isa_devclass, 0, 0);
+MODULE_DEPEND(an, isa, 1, 1, 1);
+MODULE_DEPEND(an, wlan, 1, 1, 1);
diff --git a/sys/dev/an/if_an_pccard.c b/sys/dev/an/if_an_pccard.c
index 36b263b..0b3bc33 100644
--- a/sys/dev/an/if_an_pccard.c
+++ b/sys/dev/an/if_an_pccard.c
@@ -105,8 +105,9 @@ static driver_t an_pccard_driver = {
 
 static devclass_t an_pccard_devclass;
 
-DRIVER_MODULE(if_an, pccard, an_pccard_driver, an_pccard_devclass, 0, 0);
-MODULE_DEPEND(if_an, wlan, 1, 1, 1);
+DRIVER_MODULE(an, pccard, an_pccard_driver, an_pccard_devclass, 0, 0);
+MODULE_DEPEND(an, wlan, 1, 1, 1);
+MODULE_DEPEND(an, pccard, 1, 1, 1);
 
 static const struct pccard_product an_pccard_products[] = {
 	PCMCIA_CARD(AIRONET, PC4800, 0),
diff --git a/sys/dev/an/if_an_pci.c b/sys/dev/an/if_an_pci.c
index 2969daa..eba74db 100644
--- a/sys/dev/an/if_an_pci.c
+++ b/sys/dev/an/if_an_pci.c
@@ -297,5 +297,6 @@ static driver_t an_pci_driver = {
 
 static devclass_t an_devclass;
 
-DRIVER_MODULE(if_an, pci, an_pci_driver, an_devclass, 0, 0);
-MODULE_DEPEND(if_an, wlan, 1, 1, 1);
+DRIVER_MODULE(an, pci, an_pci_driver, an_devclass, 0, 0);
+MODULE_DEPEND(an, pci, 1, 1, 1);
+MODULE_DEPEND(an, wlan, 1, 1, 1);