From cbe0a0c436162d78cc3f92a305b64918c839d079 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 21 Oct 2021 16:33:34 -0400 Subject: [PATCH] drivers/network: Move ethernet drivers to an "ether" subdirectory. Now that there is also a "tap" driver in here, and the WiFi drivers are also in a subdirectory, moving the physical ethernet device drivers to a subdirectory also makes sense. (Briefly) discussed on the mailing lists. --- src/add-ons/kernel/drivers/network/Jamfile | 42 ++----------------- .../drivers/network/{ => ether}/3com/Jamfile | 2 +- .../network/{ => ether}/3com/dev/mii/bmtphy.c | 0 .../{ => ether}/3com/dev/mii/bmtphyreg.h | 0 .../network/{ => ether}/3com/dev/mii/ukphy.c | 0 .../{ => ether}/3com/dev/mii/ukphy_subr.c | 0 .../network/{ => ether}/3com/dev/xl/if_xl.c | 0 .../{ => ether}/3com/dev/xl/if_xlreg.h | 0 .../network/{ => ether}/3com/dev/xl/xlphy.c | 0 .../drivers/network/{ => ether}/3com/glue.c | 0 .../kernel/drivers/network/ether/Jamfile | 37 ++++++++++++++++ .../network/{ => ether}/ar81xx/Jamfile | 2 +- .../{ => ether}/ar81xx/dev/ale/if_ale.c | 0 .../{ => ether}/ar81xx/dev/ale/if_alereg.h | 0 .../{ => ether}/ar81xx/dev/ale/if_alevar.h | 0 .../{ => ether}/ar81xx/dev/mii/ukphy.c | 0 .../{ => ether}/ar81xx/dev/mii/ukphy_subr.c | 0 .../drivers/network/{ => ether}/ar81xx/glue.c | 0 .../network/{ => ether}/atheros813x/Jamfile | 2 +- .../{ => ether}/atheros813x/dev/alc/if_alc.c | 0 .../atheros813x/dev/alc/if_alcreg.h | 0 .../atheros813x/dev/alc/if_alcvar.h | 0 .../{ => ether}/atheros813x/dev/mii/ukphy.c | 0 .../atheros813x/dev/mii/ukphy_subr.c | 0 .../network/{ => ether}/atheros813x/glue.c | 0 .../network/{ => ether}/attansic_l1/Jamfile | 2 +- .../{ => ether}/attansic_l1/dev/age/if_age.c | 0 .../attansic_l1/dev/age/if_agereg.h | 0 .../attansic_l1/dev/age/if_agevar.h | 0 .../{ => ether}/attansic_l1/dev/mii/atphy.c | 0 .../attansic_l1/dev/mii/atphyreg.h | 0 .../network/{ => ether}/attansic_l1/glue.c | 0 .../network/{ => ether}/attansic_l2/Jamfile | 2 +- .../{ => ether}/attansic_l2/dev/ae/if_ae.c | 0 .../{ => ether}/attansic_l2/dev/ae/if_aereg.h | 0 .../{ => ether}/attansic_l2/dev/ae/if_aevar.h | 0 .../{ => ether}/attansic_l2/dev/mii/ukphy.c | 0 .../attansic_l2/dev/mii/ukphy_subr.c | 0 .../network/{ => ether}/attansic_l2/glue.c | 0 .../network/{ => ether}/broadcom440x/Jamfile | 2 +- .../{ => ether}/broadcom440x/dev/bfe/if_bfe.c | 0 .../broadcom440x/dev/bfe/if_bfereg.h | 0 .../{ => ether}/broadcom440x/dev/mii/bmtphy.c | 0 .../broadcom440x/dev/mii/bmtphyreg.h | 0 .../network/{ => ether}/broadcom440x/glue.c | 0 .../network/{ => ether}/broadcom570x/Jamfile | 2 +- .../broadcom570x/dev/bce/if_bcereg.h | 0 .../{ => ether}/broadcom570x/dev/bge/if_bge.c | 0 .../broadcom570x/dev/bge/if_bgereg.h | 0 .../{ => ether}/broadcom570x/dev/mii/brgphy.c | 0 .../broadcom570x/dev/mii/brgphyreg.h | 0 .../{ => ether}/broadcom570x/dev/mii/ukphy.c | 0 .../broadcom570x/dev/mii/ukphy_subr.c | 0 .../network/{ => ether}/broadcom570x/glue.c | 0 .../network/{ => ether}/dec21xxx/Jamfile | 2 +- .../{ => ether}/dec21xxx/dev/dc/dcphy.c | 0 .../{ => ether}/dec21xxx/dev/dc/if_dc.c | 0 .../{ => ether}/dec21xxx/dev/dc/if_dcreg.h | 0 .../{ => ether}/dec21xxx/dev/dc/pnphy.c | 0 .../{ => ether}/dec21xxx/dev/de/dc21040reg.h | 0 .../{ => ether}/dec21xxx/dev/de/if_de.c | 0 .../{ => ether}/dec21xxx/dev/de/if_devar.h | 0 .../{ => ether}/dec21xxx/dev/mii/acphy.c | 0 .../{ => ether}/dec21xxx/dev/mii/acphyreg.h | 0 .../{ => ether}/dec21xxx/dev/mii/amphy.c | 0 .../{ => ether}/dec21xxx/dev/mii/amphyreg.h | 0 .../{ => ether}/dec21xxx/dev/mii/ukphy.c | 0 .../{ => ether}/dec21xxx/dev/mii/ukphy_subr.c | 0 .../network/{ => ether}/dec21xxx/glue.c | 0 .../network/{ => ether}/dec21xxx/glue_de.c | 0 .../network/{ => ether}/emulex_oce/Jamfile | 2 +- .../{ => ether}/emulex_oce/dev/oce/oce_hw.c | 0 .../{ => ether}/emulex_oce/dev/oce/oce_hw.h | 0 .../{ => ether}/emulex_oce/dev/oce/oce_if.c | 0 .../{ => ether}/emulex_oce/dev/oce/oce_if.h | 0 .../{ => ether}/emulex_oce/dev/oce/oce_mbox.c | 0 .../emulex_oce/dev/oce/oce_queue.c | 0 .../emulex_oce/dev/oce/oce_sysctl.c | 0 .../{ => ether}/emulex_oce/dev/oce/oce_user.h | 0 .../{ => ether}/emulex_oce/dev/oce/oce_util.c | 0 .../network/{ => ether}/emulex_oce/glue.c | 0 .../network/{ => ether}/etherpci/Jamfile | 12 +++--- .../network/{ => ether}/etherpci/etherpci.c | 0 .../{ => ether}/etherpci/etherpci_private.h | 0 .../network/{ => ether}/ipro100/Jamfile | 2 +- .../{ => ether}/ipro100/dev/fxp/if_fxp.c | 0 .../{ => ether}/ipro100/dev/fxp/if_fxpreg.h | 0 .../{ => ether}/ipro100/dev/fxp/if_fxpvar.h | 0 .../{ => ether}/ipro100/dev/fxp/inphy.c | 0 .../{ => ether}/ipro100/dev/fxp/inphyreg.h | 0 .../{ => ether}/ipro100/dev/fxp/rcvbundl.h | 0 .../network/{ => ether}/ipro100/glue.c | 0 .../network/{ => ether}/ipro1000/Jamfile | 2 +- .../{ => ether}/ipro1000/dev/e1000/LICENSE | 0 .../ipro1000/dev/e1000/e1000_80003es2lan.c | 0 .../ipro1000/dev/e1000/e1000_80003es2lan.h | 0 .../ipro1000/dev/e1000/e1000_82540.c | 0 .../ipro1000/dev/e1000/e1000_82541.c | 0 .../ipro1000/dev/e1000/e1000_82541.h | 0 .../ipro1000/dev/e1000/e1000_82542.c | 0 .../ipro1000/dev/e1000/e1000_82543.c | 0 .../ipro1000/dev/e1000/e1000_82543.h | 0 .../ipro1000/dev/e1000/e1000_82571.c | 0 .../ipro1000/dev/e1000/e1000_82571.h | 0 .../ipro1000/dev/e1000/e1000_82575.c | 0 .../ipro1000/dev/e1000/e1000_82575.h | 0 .../ipro1000/dev/e1000/e1000_api.c | 0 .../ipro1000/dev/e1000/e1000_api.h | 0 .../ipro1000/dev/e1000/e1000_defines.h | 0 .../{ => ether}/ipro1000/dev/e1000/e1000_hw.h | 0 .../ipro1000/dev/e1000/e1000_i210.c | 0 .../ipro1000/dev/e1000/e1000_i210.h | 0 .../ipro1000/dev/e1000/e1000_ich8lan.c | 0 .../ipro1000/dev/e1000/e1000_ich8lan.h | 0 .../ipro1000/dev/e1000/e1000_mac.c | 0 .../ipro1000/dev/e1000/e1000_mac.h | 0 .../ipro1000/dev/e1000/e1000_manage.c | 0 .../ipro1000/dev/e1000/e1000_manage.h | 0 .../ipro1000/dev/e1000/e1000_mbx.c | 0 .../ipro1000/dev/e1000/e1000_mbx.h | 0 .../ipro1000/dev/e1000/e1000_nvm.c | 0 .../ipro1000/dev/e1000/e1000_nvm.h | 0 .../ipro1000/dev/e1000/e1000_osdep.c | 0 .../ipro1000/dev/e1000/e1000_osdep.h | 0 .../ipro1000/dev/e1000/e1000_phy.c | 0 .../ipro1000/dev/e1000/e1000_phy.h | 0 .../ipro1000/dev/e1000/e1000_regs.h | 0 .../{ => ether}/ipro1000/dev/e1000/e1000_vf.c | 0 .../{ => ether}/ipro1000/dev/e1000/e1000_vf.h | 0 .../{ => ether}/ipro1000/dev/e1000/em_txrx.c | 0 .../{ => ether}/ipro1000/dev/e1000/if_em.c | 0 .../{ => ether}/ipro1000/dev/e1000/if_em.h | 0 .../{ => ether}/ipro1000/dev/e1000/igb_txrx.c | 0 .../network/{ => ether}/ipro1000/glue.c | 0 .../network/{ => ether}/jmicron2x0/Jamfile | 2 +- .../{ => ether}/jmicron2x0/dev/jme/if_jme.c | 0 .../jmicron2x0/dev/jme/if_jmereg.h | 0 .../jmicron2x0/dev/jme/if_jmevar.h | 0 .../{ => ether}/jmicron2x0/dev/mii/jmphy.c | 0 .../{ => ether}/jmicron2x0/dev/mii/jmphyreg.h | 0 .../network/{ => ether}/jmicron2x0/glue.c | 0 .../network/{ => ether}/marvell_yukon/Jamfile | 2 +- .../marvell_yukon/dev/mii/brgphyreg.h | 0 .../marvell_yukon/dev/mii/e1000phy.c | 0 .../marvell_yukon/dev/mii/e1000phyreg.h | 0 .../{ => ether}/marvell_yukon/dev/mii/ukphy.c | 0 .../marvell_yukon/dev/mii/ukphy_subr.c | 0 .../marvell_yukon/dev/msk/if_msk.c | 0 .../marvell_yukon/dev/msk/if_mskreg.h | 0 .../network/{ => ether}/marvell_yukon/glue.c | 0 .../network/{ => ether}/nforce/Jamfile | 2 +- .../{ => ether}/nforce/dev/mii/ciphy.c | 0 .../{ => ether}/nforce/dev/mii/ciphyreg.h | 0 .../{ => ether}/nforce/dev/mii/ukphy.c | 0 .../{ => ether}/nforce/dev/mii/ukphy_subr.c | 0 .../{ => ether}/nforce/dev/nfe/if_nfe.c | 0 .../{ => ether}/nforce/dev/nfe/if_nfereg.h | 0 .../{ => ether}/nforce/dev/nfe/if_nfevar.h | 0 .../drivers/network/{ => ether}/nforce/glue.c | 0 .../drivers/network/{ => ether}/pcnet/Jamfile | 2 +- .../network/{ => ether}/pcnet/dev/le/am7990.c | 0 .../{ => ether}/pcnet/dev/le/am79900.c | 0 .../{ => ether}/pcnet/dev/le/am79900reg.h | 0 .../{ => ether}/pcnet/dev/le/am79900var.h | 0 .../{ => ether}/pcnet/dev/le/am7990reg.h | 0 .../{ => ether}/pcnet/dev/le/am7990var.h | 0 .../{ => ether}/pcnet/dev/le/if_le_ledma.c | 0 .../{ => ether}/pcnet/dev/le/if_le_pci.c | 0 .../network/{ => ether}/pcnet/dev/le/lance.c | 0 .../{ => ether}/pcnet/dev/le/lancereg.h | 0 .../{ => ether}/pcnet/dev/le/lancevar.h | 0 .../network/{ => ether}/pcnet/dev/mii/nsphy.c | 0 .../{ => ether}/pcnet/dev/mii/nsphyreg.h | 0 .../{ => ether}/pcnet/dev/mii/nsphyter.c | 0 .../{ => ether}/pcnet/dev/mii/nsphyterreg.h | 0 .../network/{ => ether}/pcnet/dev/mii/ukphy.c | 0 .../{ => ether}/pcnet/dev/mii/ukphy_subr.c | 0 .../{ => ether}/pcnet/dev/pcn/if_pcn.c | 0 .../{ => ether}/pcnet/dev/pcn/if_pcnreg.h | 0 .../drivers/network/{ => ether}/pcnet/glue.c | 0 .../network/{ => ether}/pcnet/glue_pcn.c | 0 .../network/{ => ether}/pegasus/Jamfile | 2 +- .../network/{ => ether}/pegasus/devlist.c | 0 .../network/{ => ether}/pegasus/driver.c | 0 .../network/{ => ether}/pegasus/driver.h | 0 .../network/{ => ether}/pegasus/if_aue.c | 0 .../network/{ => ether}/pegasus/if_auereg.h | 0 .../drivers/network/{ => ether}/rdc/Jamfile | 2 +- .../network/{ => ether}/rdc/dev/mii/rdcphy.c | 0 .../{ => ether}/rdc/dev/mii/rdcphyreg.h | 0 .../network/{ => ether}/rdc/dev/vte/if_vte.c | 0 .../{ => ether}/rdc/dev/vte/if_vtereg.h | 0 .../{ => ether}/rdc/dev/vte/if_vtevar.h | 0 .../drivers/network/{ => ether}/rdc/glue.c | 0 .../network/{ => ether}/rtl8139/Jamfile | 2 +- .../{ => ether}/rtl8139/dev/mii/rlphy.c | 0 .../{ => ether}/rtl8139/dev/rl/if_rl.c | 0 .../{ => ether}/rtl8139/dev/rl/if_rlreg.h | 0 .../network/{ => ether}/rtl8139/glue.c | 0 .../network/{ => ether}/rtl81xx/Jamfile | 2 +- .../{ => ether}/rtl81xx/dev/mii/rgephy.c | 0 .../{ => ether}/rtl81xx/dev/mii/rgephyreg.h | 0 .../{ => ether}/rtl81xx/dev/mii/rlphy.c | 0 .../{ => ether}/rtl81xx/dev/re/if_re.c | 0 .../{ => ether}/rtl81xx/dev/rl/if_rlreg.h | 0 .../network/{ => ether}/rtl81xx/glue.c | 0 .../network/{ => ether}/sis19x/Jamfile | 2 +- .../{ => ether}/sis19x/dev/mii/ukphy.c | 0 .../{ => ether}/sis19x/dev/mii/ukphy_subr.c | 0 .../{ => ether}/sis19x/dev/sge/if_sge.c | 0 .../{ => ether}/sis19x/dev/sge/if_sgereg.h | 0 .../drivers/network/{ => ether}/sis19x/glue.c | 0 .../network/{ => ether}/sis900/Jamfile | 2 +- .../{ => ether}/sis900/dev/mii/icsphy.c | 0 .../{ => ether}/sis900/dev/mii/icsphyreg.h | 0 .../{ => ether}/sis900/dev/mii/nsphyter.c | 0 .../{ => ether}/sis900/dev/mii/nsphyterreg.h | 0 .../{ => ether}/sis900/dev/mii/ukphy.c | 0 .../{ => ether}/sis900/dev/mii/ukphy_subr.c | 0 .../{ => ether}/sis900/dev/sis/if_sis.c | 0 .../{ => ether}/sis900/dev/sis/if_sisreg.h | 0 .../drivers/network/{ => ether}/sis900/glue.c | 0 .../network/{ => ether}/syskonnect/Jamfile | 2 +- .../syskonnect/dev/mii/brgphyreg.h | 0 .../{ => ether}/syskonnect/dev/mii/e1000phy.c | 0 .../syskonnect/dev/mii/e1000phyreg.h | 0 .../{ => ether}/syskonnect/dev/mii/ukphy.c | 0 .../syskonnect/dev/mii/ukphy_subr.c | 0 .../{ => ether}/syskonnect/dev/mii/xmphy.c | 0 .../{ => ether}/syskonnect/dev/mii/xmphyreg.h | 0 .../{ => ether}/syskonnect/dev/sk/if_sk.c | 0 .../{ => ether}/syskonnect/dev/sk/if_skreg.h | 0 .../{ => ether}/syskonnect/dev/sk/xmaciireg.h | 0 .../{ => ether}/syskonnect/dev/sk/yukonreg.h | 0 .../network/{ => ether}/syskonnect/glue.c | 0 .../{ => ether}/usb_asix/ASIXDevice.cpp | 0 .../network/{ => ether}/usb_asix/ASIXDevice.h | 0 .../{ => ether}/usb_asix/ASIXVendorRequests.h | 0 .../{ => ether}/usb_asix/AX88172Device.cpp | 0 .../{ => ether}/usb_asix/AX88172Device.h | 0 .../{ => ether}/usb_asix/AX88178Device.cpp | 0 .../{ => ether}/usb_asix/AX88178Device.h | 0 .../{ => ether}/usb_asix/AX88772Device.cpp | 0 .../{ => ether}/usb_asix/AX88772Device.h | 0 .../network/{ => ether}/usb_asix/Driver.cpp | 0 .../network/{ => ether}/usb_asix/Driver.h | 0 .../network/{ => ether}/usb_asix/Jamfile | 2 +- .../network/{ => ether}/usb_asix/MIIBus.cpp | 0 .../network/{ => ether}/usb_asix/MIIBus.h | 0 .../network/{ => ether}/usb_asix/Settings.cpp | 0 .../network/{ => ether}/usb_asix/Settings.h | 0 .../{ => ether}/usb_asix/usb_asix.settings | 0 .../{ => ether}/usb_davicom/DavicomDevice.cpp | 0 .../{ => ether}/usb_davicom/DavicomDevice.h | 0 .../{ => ether}/usb_davicom/Driver.cpp | 0 .../network/{ => ether}/usb_davicom/Driver.h | 0 .../network/{ => ether}/usb_davicom/Jamfile | 2 +- .../{ => ether}/usb_davicom/Settings.cpp | 0 .../{ => ether}/usb_davicom/Settings.h | 0 .../usb_davicom/usb_davicom.settings | 0 .../network/{ => ether}/usb_ecm/Driver.cpp | 0 .../network/{ => ether}/usb_ecm/Driver.h | 0 .../network/{ => ether}/usb_ecm/ECMDevice.cpp | 0 .../network/{ => ether}/usb_ecm/ECMDevice.h | 0 .../network/{ => ether}/usb_ecm/Jamfile | 2 +- .../network/{ => ether}/via_rhine/Jamfile | 2 +- .../{ => ether}/via_rhine/dev/mii/ciphy.c | 0 .../{ => ether}/via_rhine/dev/mii/ciphyreg.h | 0 .../{ => ether}/via_rhine/dev/mii/ukphy.c | 0 .../via_rhine/dev/mii/ukphy_subr.c | 0 .../{ => ether}/via_rhine/dev/vr/if_vr.c | 0 .../{ => ether}/via_rhine/dev/vr/if_vrreg.h | 0 .../network/{ => ether}/via_rhine/glue.c | 0 .../network/{ => ether}/virtio/Jamfile | 2 +- .../network/{ => ether}/virtio/virtio_net.cpp | 0 .../network/{ => ether}/virtio/virtio_net.h | 0 .../network/{ => ether}/vt612x/Jamfile | 2 +- .../{ => ether}/vt612x/dev/mii/ciphy.c | 0 .../{ => ether}/vt612x/dev/mii/ciphyreg.h | 0 .../{ => ether}/vt612x/dev/mii/ukphy.c | 0 .../{ => ether}/vt612x/dev/mii/ukphy_subr.c | 0 .../{ => ether}/vt612x/dev/vge/if_vge.c | 0 .../{ => ether}/vt612x/dev/vge/if_vgereg.h | 0 .../{ => ether}/vt612x/dev/vge/if_vgevar.h | 0 .../drivers/network/{ => ether}/vt612x/glue.c | 0 .../drivers/network/{ => ether}/wb840/Jamfile | 12 +++--- .../drivers/network/{ => ether}/wb840/debug.h | 0 .../network/{ => ether}/wb840/device.c | 0 .../network/{ => ether}/wb840/device.h | 0 .../network/{ => ether}/wb840/driver.c | 0 .../network/{ => ether}/wb840/driver.h | 0 .../network/{ => ether}/wb840/interface.c | 0 .../network/{ => ether}/wb840/interface.h | 0 .../drivers/network/{ => ether}/wb840/wb840.c | 0 .../drivers/network/{ => ether}/wb840/wb840.h | 0 295 files changed, 80 insertions(+), 79 deletions(-) rename src/add-ons/kernel/drivers/network/{ => ether}/3com/Jamfile (91%) rename src/add-ons/kernel/drivers/network/{ => ether}/3com/dev/mii/bmtphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/3com/dev/mii/bmtphyreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/3com/dev/mii/ukphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/3com/dev/mii/ukphy_subr.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/3com/dev/xl/if_xl.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/3com/dev/xl/if_xlreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/3com/dev/xl/xlphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/3com/glue.c (100%) create mode 100644 src/add-ons/kernel/drivers/network/ether/Jamfile rename src/add-ons/kernel/drivers/network/{ => ether}/ar81xx/Jamfile (90%) rename src/add-ons/kernel/drivers/network/{ => ether}/ar81xx/dev/ale/if_ale.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ar81xx/dev/ale/if_alereg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ar81xx/dev/ale/if_alevar.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ar81xx/dev/mii/ukphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ar81xx/dev/mii/ukphy_subr.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ar81xx/glue.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/atheros813x/Jamfile (89%) rename src/add-ons/kernel/drivers/network/{ => ether}/atheros813x/dev/alc/if_alc.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/atheros813x/dev/alc/if_alcreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/atheros813x/dev/alc/if_alcvar.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/atheros813x/dev/mii/ukphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/atheros813x/dev/mii/ukphy_subr.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/atheros813x/glue.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/attansic_l1/Jamfile (89%) rename src/add-ons/kernel/drivers/network/{ => ether}/attansic_l1/dev/age/if_age.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/attansic_l1/dev/age/if_agereg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/attansic_l1/dev/age/if_agevar.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/attansic_l1/dev/mii/atphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/attansic_l1/dev/mii/atphyreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/attansic_l1/glue.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/attansic_l2/Jamfile (89%) rename src/add-ons/kernel/drivers/network/{ => ether}/attansic_l2/dev/ae/if_ae.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/attansic_l2/dev/ae/if_aereg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/attansic_l2/dev/ae/if_aevar.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/attansic_l2/dev/mii/ukphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/attansic_l2/dev/mii/ukphy_subr.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/attansic_l2/glue.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/broadcom440x/Jamfile (89%) rename src/add-ons/kernel/drivers/network/{ => ether}/broadcom440x/dev/bfe/if_bfe.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/broadcom440x/dev/bfe/if_bfereg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/broadcom440x/dev/mii/bmtphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/broadcom440x/dev/mii/bmtphyreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/broadcom440x/glue.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/broadcom570x/Jamfile (91%) rename src/add-ons/kernel/drivers/network/{ => ether}/broadcom570x/dev/bce/if_bcereg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/broadcom570x/dev/bge/if_bge.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/broadcom570x/dev/bge/if_bgereg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/broadcom570x/dev/mii/brgphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/broadcom570x/dev/mii/brgphyreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/broadcom570x/dev/mii/ukphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/broadcom570x/dev/mii/ukphy_subr.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/broadcom570x/glue.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/dec21xxx/Jamfile (93%) rename src/add-ons/kernel/drivers/network/{ => ether}/dec21xxx/dev/dc/dcphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/dec21xxx/dev/dc/if_dc.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/dec21xxx/dev/dc/if_dcreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/dec21xxx/dev/dc/pnphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/dec21xxx/dev/de/dc21040reg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/dec21xxx/dev/de/if_de.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/dec21xxx/dev/de/if_devar.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/dec21xxx/dev/mii/acphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/dec21xxx/dev/mii/acphyreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/dec21xxx/dev/mii/amphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/dec21xxx/dev/mii/amphyreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/dec21xxx/dev/mii/ukphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/dec21xxx/dev/mii/ukphy_subr.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/dec21xxx/glue.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/dec21xxx/glue_de.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/emulex_oce/Jamfile (86%) rename src/add-ons/kernel/drivers/network/{ => ether}/emulex_oce/dev/oce/oce_hw.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/emulex_oce/dev/oce/oce_hw.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/emulex_oce/dev/oce/oce_if.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/emulex_oce/dev/oce/oce_if.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/emulex_oce/dev/oce/oce_mbox.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/emulex_oce/dev/oce/oce_queue.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/emulex_oce/dev/oce/oce_sysctl.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/emulex_oce/dev/oce/oce_user.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/emulex_oce/dev/oce/oce_util.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/emulex_oce/glue.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/etherpci/Jamfile (57%) rename src/add-ons/kernel/drivers/network/{ => ether}/etherpci/etherpci.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/etherpci/etherpci_private.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro100/Jamfile (89%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro100/dev/fxp/if_fxp.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro100/dev/fxp/if_fxpreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro100/dev/fxp/if_fxpvar.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro100/dev/fxp/inphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro100/dev/fxp/inphyreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro100/dev/fxp/rcvbundl.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro100/glue.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/Jamfile (91%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/LICENSE (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_80003es2lan.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_80003es2lan.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_82540.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_82541.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_82541.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_82542.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_82543.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_82543.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_82571.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_82571.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_82575.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_82575.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_api.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_api.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_defines.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_hw.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_i210.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_i210.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_ich8lan.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_ich8lan.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_mac.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_mac.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_manage.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_manage.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_mbx.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_mbx.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_nvm.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_nvm.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_osdep.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_osdep.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_phy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_phy.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_regs.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_vf.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/e1000_vf.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/em_txrx.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/if_em.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/if_em.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/dev/e1000/igb_txrx.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/ipro1000/glue.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/jmicron2x0/Jamfile (89%) rename src/add-ons/kernel/drivers/network/{ => ether}/jmicron2x0/dev/jme/if_jme.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/jmicron2x0/dev/jme/if_jmereg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/jmicron2x0/dev/jme/if_jmevar.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/jmicron2x0/dev/mii/jmphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/jmicron2x0/dev/mii/jmphyreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/jmicron2x0/glue.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/marvell_yukon/Jamfile (90%) rename src/add-ons/kernel/drivers/network/{ => ether}/marvell_yukon/dev/mii/brgphyreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/marvell_yukon/dev/mii/e1000phy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/marvell_yukon/dev/mii/e1000phyreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/marvell_yukon/dev/mii/ukphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/marvell_yukon/dev/mii/ukphy_subr.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/marvell_yukon/dev/msk/if_msk.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/marvell_yukon/dev/msk/if_mskreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/marvell_yukon/glue.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/nforce/Jamfile (90%) rename src/add-ons/kernel/drivers/network/{ => ether}/nforce/dev/mii/ciphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/nforce/dev/mii/ciphyreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/nforce/dev/mii/ukphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/nforce/dev/mii/ukphy_subr.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/nforce/dev/nfe/if_nfe.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/nforce/dev/nfe/if_nfereg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/nforce/dev/nfe/if_nfevar.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/nforce/glue.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pcnet/Jamfile (93%) rename src/add-ons/kernel/drivers/network/{ => ether}/pcnet/dev/le/am7990.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pcnet/dev/le/am79900.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pcnet/dev/le/am79900reg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pcnet/dev/le/am79900var.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pcnet/dev/le/am7990reg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pcnet/dev/le/am7990var.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pcnet/dev/le/if_le_ledma.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pcnet/dev/le/if_le_pci.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pcnet/dev/le/lance.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pcnet/dev/le/lancereg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pcnet/dev/le/lancevar.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pcnet/dev/mii/nsphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pcnet/dev/mii/nsphyreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pcnet/dev/mii/nsphyter.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pcnet/dev/mii/nsphyterreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pcnet/dev/mii/ukphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pcnet/dev/mii/ukphy_subr.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pcnet/dev/pcn/if_pcn.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pcnet/dev/pcn/if_pcnreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pcnet/glue.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pcnet/glue_pcn.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pegasus/Jamfile (84%) rename src/add-ons/kernel/drivers/network/{ => ether}/pegasus/devlist.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pegasus/driver.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pegasus/driver.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pegasus/if_aue.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/pegasus/if_auereg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/rdc/Jamfile (90%) rename src/add-ons/kernel/drivers/network/{ => ether}/rdc/dev/mii/rdcphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/rdc/dev/mii/rdcphyreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/rdc/dev/vte/if_vte.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/rdc/dev/vte/if_vtereg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/rdc/dev/vte/if_vtevar.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/rdc/glue.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/rtl8139/Jamfile (90%) rename src/add-ons/kernel/drivers/network/{ => ether}/rtl8139/dev/mii/rlphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/rtl8139/dev/rl/if_rl.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/rtl8139/dev/rl/if_rlreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/rtl8139/glue.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/rtl81xx/Jamfile (90%) rename src/add-ons/kernel/drivers/network/{ => ether}/rtl81xx/dev/mii/rgephy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/rtl81xx/dev/mii/rgephyreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/rtl81xx/dev/mii/rlphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/rtl81xx/dev/re/if_re.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/rtl81xx/dev/rl/if_rlreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/rtl81xx/glue.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/sis19x/Jamfile (91%) rename src/add-ons/kernel/drivers/network/{ => ether}/sis19x/dev/mii/ukphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/sis19x/dev/mii/ukphy_subr.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/sis19x/dev/sge/if_sge.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/sis19x/dev/sge/if_sgereg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/sis19x/glue.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/sis900/Jamfile (91%) rename src/add-ons/kernel/drivers/network/{ => ether}/sis900/dev/mii/icsphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/sis900/dev/mii/icsphyreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/sis900/dev/mii/nsphyter.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/sis900/dev/mii/nsphyterreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/sis900/dev/mii/ukphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/sis900/dev/mii/ukphy_subr.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/sis900/dev/sis/if_sis.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/sis900/dev/sis/if_sisreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/sis900/glue.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/syskonnect/Jamfile (90%) rename src/add-ons/kernel/drivers/network/{ => ether}/syskonnect/dev/mii/brgphyreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/syskonnect/dev/mii/e1000phy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/syskonnect/dev/mii/e1000phyreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/syskonnect/dev/mii/ukphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/syskonnect/dev/mii/ukphy_subr.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/syskonnect/dev/mii/xmphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/syskonnect/dev/mii/xmphyreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/syskonnect/dev/sk/if_sk.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/syskonnect/dev/sk/if_skreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/syskonnect/dev/sk/xmaciireg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/syskonnect/dev/sk/yukonreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/syskonnect/glue.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_asix/ASIXDevice.cpp (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_asix/ASIXDevice.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_asix/ASIXVendorRequests.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_asix/AX88172Device.cpp (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_asix/AX88172Device.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_asix/AX88178Device.cpp (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_asix/AX88178Device.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_asix/AX88772Device.cpp (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_asix/AX88772Device.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_asix/Driver.cpp (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_asix/Driver.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_asix/Jamfile (73%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_asix/MIIBus.cpp (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_asix/MIIBus.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_asix/Settings.cpp (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_asix/Settings.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_asix/usb_asix.settings (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_davicom/DavicomDevice.cpp (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_davicom/DavicomDevice.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_davicom/Driver.cpp (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_davicom/Driver.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_davicom/Jamfile (64%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_davicom/Settings.cpp (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_davicom/Settings.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_davicom/usb_davicom.settings (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_ecm/Driver.cpp (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_ecm/Driver.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_ecm/ECMDevice.cpp (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_ecm/ECMDevice.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/usb_ecm/Jamfile (60%) rename src/add-ons/kernel/drivers/network/{ => ether}/via_rhine/Jamfile (90%) rename src/add-ons/kernel/drivers/network/{ => ether}/via_rhine/dev/mii/ciphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/via_rhine/dev/mii/ciphyreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/via_rhine/dev/mii/ukphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/via_rhine/dev/mii/ukphy_subr.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/via_rhine/dev/vr/if_vr.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/via_rhine/dev/vr/if_vrreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/via_rhine/glue.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/virtio/Jamfile (62%) rename src/add-ons/kernel/drivers/network/{ => ether}/virtio/virtio_net.cpp (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/virtio/virtio_net.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/vt612x/Jamfile (90%) rename src/add-ons/kernel/drivers/network/{ => ether}/vt612x/dev/mii/ciphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/vt612x/dev/mii/ciphyreg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/vt612x/dev/mii/ukphy.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/vt612x/dev/mii/ukphy_subr.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/vt612x/dev/vge/if_vge.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/vt612x/dev/vge/if_vgereg.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/vt612x/dev/vge/if_vgevar.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/vt612x/glue.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/wb840/Jamfile (74%) rename src/add-ons/kernel/drivers/network/{ => ether}/wb840/debug.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/wb840/device.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/wb840/device.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/wb840/driver.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/wb840/driver.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/wb840/interface.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/wb840/interface.h (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/wb840/wb840.c (100%) rename src/add-ons/kernel/drivers/network/{ => ether}/wb840/wb840.h (100%) diff --git a/src/add-ons/kernel/drivers/network/Jamfile b/src/add-ons/kernel/drivers/network/Jamfile index 4844ce2b5e..c4d07a4f57 100644 --- a/src/add-ons/kernel/drivers/network/Jamfile +++ b/src/add-ons/kernel/drivers/network/Jamfile @@ -1,41 +1,5 @@ SubDir HAIKU_TOP src add-ons kernel drivers network ; -# subdirectories with more than one driver in them -SubInclude HAIKU_TOP src add-ons kernel drivers network wlan ; -SubInclude HAIKU_TOP src add-ons kernel drivers network wwan ; - -# Haiku-native drivers -SubInclude HAIKU_TOP src add-ons kernel drivers network etherpci ; -SubInclude HAIKU_TOP src add-ons kernel drivers network pegasus ; -SubInclude HAIKU_TOP src add-ons kernel drivers network virtio ; -SubInclude HAIKU_TOP src add-ons kernel drivers network usb_asix ; -SubInclude HAIKU_TOP src add-ons kernel drivers network usb_davicom ; -SubInclude HAIKU_TOP src add-ons kernel drivers network usb_ecm ; -SubInclude HAIKU_TOP src add-ons kernel drivers network wb840 ; - -# FreeBSD 12 drivers -SubInclude HAIKU_TOP src add-ons kernel drivers network 3com ; -SubInclude HAIKU_TOP src add-ons kernel drivers network ar81xx ; -SubInclude HAIKU_TOP src add-ons kernel drivers network attansic_l1 ; -SubInclude HAIKU_TOP src add-ons kernel drivers network attansic_l2 ; -SubInclude HAIKU_TOP src add-ons kernel drivers network broadcom440x ; -SubInclude HAIKU_TOP src add-ons kernel drivers network dec21xxx ; -SubInclude HAIKU_TOP src add-ons kernel drivers network emulex_oce ; -SubInclude HAIKU_TOP src add-ons kernel drivers network ipro100 ; -SubInclude HAIKU_TOP src add-ons kernel drivers network jmicron2x0 ; -SubInclude HAIKU_TOP src add-ons kernel drivers network marvell_yukon ; -SubInclude HAIKU_TOP src add-ons kernel drivers network nforce ; -SubInclude HAIKU_TOP src add-ons kernel drivers network pcnet ; -SubInclude HAIKU_TOP src add-ons kernel drivers network rdc ; -SubInclude HAIKU_TOP src add-ons kernel drivers network rtl8139 ; -SubInclude HAIKU_TOP src add-ons kernel drivers network sis19x ; -SubInclude HAIKU_TOP src add-ons kernel drivers network sis900 ; -SubInclude HAIKU_TOP src add-ons kernel drivers network syskonnect ; -SubInclude HAIKU_TOP src add-ons kernel drivers network via_rhine ; -SubInclude HAIKU_TOP src add-ons kernel drivers network vt612x ; - -# FreeBSD 13 drivers -SubInclude HAIKU_TOP src add-ons kernel drivers network atheros813x ; -SubInclude HAIKU_TOP src add-ons kernel drivers network broadcom570x ; -SubInclude HAIKU_TOP src add-ons kernel drivers network ipro1000 ; -SubInclude HAIKU_TOP src add-ons kernel drivers network rtl81xx ; +HaikuSubInclude ether ; +HaikuSubInclude wlan ; +HaikuSubInclude wwan ; diff --git a/src/add-ons/kernel/drivers/network/3com/Jamfile b/src/add-ons/kernel/drivers/network/ether/3com/Jamfile similarity index 91% rename from src/add-ons/kernel/drivers/network/3com/Jamfile rename to src/add-ons/kernel/drivers/network/ether/3com/Jamfile index 9bf2f7bfca..155fd0db9c 100644 --- a/src/add-ons/kernel/drivers/network/3com/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/3com/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network 3com ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether 3com ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; diff --git a/src/add-ons/kernel/drivers/network/3com/dev/mii/bmtphy.c b/src/add-ons/kernel/drivers/network/ether/3com/dev/mii/bmtphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/3com/dev/mii/bmtphy.c rename to src/add-ons/kernel/drivers/network/ether/3com/dev/mii/bmtphy.c diff --git a/src/add-ons/kernel/drivers/network/3com/dev/mii/bmtphyreg.h b/src/add-ons/kernel/drivers/network/ether/3com/dev/mii/bmtphyreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/3com/dev/mii/bmtphyreg.h rename to src/add-ons/kernel/drivers/network/ether/3com/dev/mii/bmtphyreg.h diff --git a/src/add-ons/kernel/drivers/network/3com/dev/mii/ukphy.c b/src/add-ons/kernel/drivers/network/ether/3com/dev/mii/ukphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/3com/dev/mii/ukphy.c rename to src/add-ons/kernel/drivers/network/ether/3com/dev/mii/ukphy.c diff --git a/src/add-ons/kernel/drivers/network/3com/dev/mii/ukphy_subr.c b/src/add-ons/kernel/drivers/network/ether/3com/dev/mii/ukphy_subr.c similarity index 100% rename from src/add-ons/kernel/drivers/network/3com/dev/mii/ukphy_subr.c rename to src/add-ons/kernel/drivers/network/ether/3com/dev/mii/ukphy_subr.c diff --git a/src/add-ons/kernel/drivers/network/3com/dev/xl/if_xl.c b/src/add-ons/kernel/drivers/network/ether/3com/dev/xl/if_xl.c similarity index 100% rename from src/add-ons/kernel/drivers/network/3com/dev/xl/if_xl.c rename to src/add-ons/kernel/drivers/network/ether/3com/dev/xl/if_xl.c diff --git a/src/add-ons/kernel/drivers/network/3com/dev/xl/if_xlreg.h b/src/add-ons/kernel/drivers/network/ether/3com/dev/xl/if_xlreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/3com/dev/xl/if_xlreg.h rename to src/add-ons/kernel/drivers/network/ether/3com/dev/xl/if_xlreg.h diff --git a/src/add-ons/kernel/drivers/network/3com/dev/xl/xlphy.c b/src/add-ons/kernel/drivers/network/ether/3com/dev/xl/xlphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/3com/dev/xl/xlphy.c rename to src/add-ons/kernel/drivers/network/ether/3com/dev/xl/xlphy.c diff --git a/src/add-ons/kernel/drivers/network/3com/glue.c b/src/add-ons/kernel/drivers/network/ether/3com/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/3com/glue.c rename to src/add-ons/kernel/drivers/network/ether/3com/glue.c diff --git a/src/add-ons/kernel/drivers/network/ether/Jamfile b/src/add-ons/kernel/drivers/network/ether/Jamfile new file mode 100644 index 0000000000..7d7d4bd2a3 --- /dev/null +++ b/src/add-ons/kernel/drivers/network/ether/Jamfile @@ -0,0 +1,37 @@ +SubDir HAIKU_TOP src add-ons kernel drivers network ether ; + +# Haiku-native drivers +HaikuSubInclude etherpci ; +HaikuSubInclude pegasus ; +HaikuSubInclude virtio ; +HaikuSubInclude usb_asix ; +HaikuSubInclude usb_davicom ; +HaikuSubInclude usb_ecm ; +HaikuSubInclude wb840 ; + +# FreeBSD 12 drivers +HaikuSubInclude 3com ; +HaikuSubInclude ar81xx ; +HaikuSubInclude attansic_l1 ; +HaikuSubInclude attansic_l2 ; +HaikuSubInclude broadcom440x ; +HaikuSubInclude dec21xxx ; +HaikuSubInclude emulex_oce ; +HaikuSubInclude ipro100 ; +HaikuSubInclude jmicron2x0 ; +HaikuSubInclude marvell_yukon ; +HaikuSubInclude nforce ; +HaikuSubInclude pcnet ; +HaikuSubInclude rdc ; +HaikuSubInclude rtl8139 ; +HaikuSubInclude sis19x ; +HaikuSubInclude sis900 ; +HaikuSubInclude syskonnect ; +HaikuSubInclude via_rhine ; +HaikuSubInclude vt612x ; + +# FreeBSD 13 drivers +HaikuSubInclude atheros813x ; +HaikuSubInclude broadcom570x ; +HaikuSubInclude ipro1000 ; +HaikuSubInclude rtl81xx ; diff --git a/src/add-ons/kernel/drivers/network/ar81xx/Jamfile b/src/add-ons/kernel/drivers/network/ether/ar81xx/Jamfile similarity index 90% rename from src/add-ons/kernel/drivers/network/ar81xx/Jamfile rename to src/add-ons/kernel/drivers/network/ether/ar81xx/Jamfile index e5d6ca5e74..64b6406b86 100644 --- a/src/add-ons/kernel/drivers/network/ar81xx/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/ar81xx/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network ar81xx ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether ar81xx ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; diff --git a/src/add-ons/kernel/drivers/network/ar81xx/dev/ale/if_ale.c b/src/add-ons/kernel/drivers/network/ether/ar81xx/dev/ale/if_ale.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ar81xx/dev/ale/if_ale.c rename to src/add-ons/kernel/drivers/network/ether/ar81xx/dev/ale/if_ale.c diff --git a/src/add-ons/kernel/drivers/network/ar81xx/dev/ale/if_alereg.h b/src/add-ons/kernel/drivers/network/ether/ar81xx/dev/ale/if_alereg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ar81xx/dev/ale/if_alereg.h rename to src/add-ons/kernel/drivers/network/ether/ar81xx/dev/ale/if_alereg.h diff --git a/src/add-ons/kernel/drivers/network/ar81xx/dev/ale/if_alevar.h b/src/add-ons/kernel/drivers/network/ether/ar81xx/dev/ale/if_alevar.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ar81xx/dev/ale/if_alevar.h rename to src/add-ons/kernel/drivers/network/ether/ar81xx/dev/ale/if_alevar.h diff --git a/src/add-ons/kernel/drivers/network/ar81xx/dev/mii/ukphy.c b/src/add-ons/kernel/drivers/network/ether/ar81xx/dev/mii/ukphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ar81xx/dev/mii/ukphy.c rename to src/add-ons/kernel/drivers/network/ether/ar81xx/dev/mii/ukphy.c diff --git a/src/add-ons/kernel/drivers/network/ar81xx/dev/mii/ukphy_subr.c b/src/add-ons/kernel/drivers/network/ether/ar81xx/dev/mii/ukphy_subr.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ar81xx/dev/mii/ukphy_subr.c rename to src/add-ons/kernel/drivers/network/ether/ar81xx/dev/mii/ukphy_subr.c diff --git a/src/add-ons/kernel/drivers/network/ar81xx/glue.c b/src/add-ons/kernel/drivers/network/ether/ar81xx/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ar81xx/glue.c rename to src/add-ons/kernel/drivers/network/ether/ar81xx/glue.c diff --git a/src/add-ons/kernel/drivers/network/atheros813x/Jamfile b/src/add-ons/kernel/drivers/network/ether/atheros813x/Jamfile similarity index 89% rename from src/add-ons/kernel/drivers/network/atheros813x/Jamfile rename to src/add-ons/kernel/drivers/network/ether/atheros813x/Jamfile index 7858b17e42..e54764066a 100644 --- a/src/add-ons/kernel/drivers/network/atheros813x/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/atheros813x/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network atheros813x ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether atheros813x ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; diff --git a/src/add-ons/kernel/drivers/network/atheros813x/dev/alc/if_alc.c b/src/add-ons/kernel/drivers/network/ether/atheros813x/dev/alc/if_alc.c similarity index 100% rename from src/add-ons/kernel/drivers/network/atheros813x/dev/alc/if_alc.c rename to src/add-ons/kernel/drivers/network/ether/atheros813x/dev/alc/if_alc.c diff --git a/src/add-ons/kernel/drivers/network/atheros813x/dev/alc/if_alcreg.h b/src/add-ons/kernel/drivers/network/ether/atheros813x/dev/alc/if_alcreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/atheros813x/dev/alc/if_alcreg.h rename to src/add-ons/kernel/drivers/network/ether/atheros813x/dev/alc/if_alcreg.h diff --git a/src/add-ons/kernel/drivers/network/atheros813x/dev/alc/if_alcvar.h b/src/add-ons/kernel/drivers/network/ether/atheros813x/dev/alc/if_alcvar.h similarity index 100% rename from src/add-ons/kernel/drivers/network/atheros813x/dev/alc/if_alcvar.h rename to src/add-ons/kernel/drivers/network/ether/atheros813x/dev/alc/if_alcvar.h diff --git a/src/add-ons/kernel/drivers/network/atheros813x/dev/mii/ukphy.c b/src/add-ons/kernel/drivers/network/ether/atheros813x/dev/mii/ukphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/atheros813x/dev/mii/ukphy.c rename to src/add-ons/kernel/drivers/network/ether/atheros813x/dev/mii/ukphy.c diff --git a/src/add-ons/kernel/drivers/network/atheros813x/dev/mii/ukphy_subr.c b/src/add-ons/kernel/drivers/network/ether/atheros813x/dev/mii/ukphy_subr.c similarity index 100% rename from src/add-ons/kernel/drivers/network/atheros813x/dev/mii/ukphy_subr.c rename to src/add-ons/kernel/drivers/network/ether/atheros813x/dev/mii/ukphy_subr.c diff --git a/src/add-ons/kernel/drivers/network/atheros813x/glue.c b/src/add-ons/kernel/drivers/network/ether/atheros813x/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/atheros813x/glue.c rename to src/add-ons/kernel/drivers/network/ether/atheros813x/glue.c diff --git a/src/add-ons/kernel/drivers/network/attansic_l1/Jamfile b/src/add-ons/kernel/drivers/network/ether/attansic_l1/Jamfile similarity index 89% rename from src/add-ons/kernel/drivers/network/attansic_l1/Jamfile rename to src/add-ons/kernel/drivers/network/ether/attansic_l1/Jamfile index 416ed56592..ce9dd21586 100644 --- a/src/add-ons/kernel/drivers/network/attansic_l1/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/attansic_l1/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network attansic_l1 ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether attansic_l1 ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; diff --git a/src/add-ons/kernel/drivers/network/attansic_l1/dev/age/if_age.c b/src/add-ons/kernel/drivers/network/ether/attansic_l1/dev/age/if_age.c similarity index 100% rename from src/add-ons/kernel/drivers/network/attansic_l1/dev/age/if_age.c rename to src/add-ons/kernel/drivers/network/ether/attansic_l1/dev/age/if_age.c diff --git a/src/add-ons/kernel/drivers/network/attansic_l1/dev/age/if_agereg.h b/src/add-ons/kernel/drivers/network/ether/attansic_l1/dev/age/if_agereg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/attansic_l1/dev/age/if_agereg.h rename to src/add-ons/kernel/drivers/network/ether/attansic_l1/dev/age/if_agereg.h diff --git a/src/add-ons/kernel/drivers/network/attansic_l1/dev/age/if_agevar.h b/src/add-ons/kernel/drivers/network/ether/attansic_l1/dev/age/if_agevar.h similarity index 100% rename from src/add-ons/kernel/drivers/network/attansic_l1/dev/age/if_agevar.h rename to src/add-ons/kernel/drivers/network/ether/attansic_l1/dev/age/if_agevar.h diff --git a/src/add-ons/kernel/drivers/network/attansic_l1/dev/mii/atphy.c b/src/add-ons/kernel/drivers/network/ether/attansic_l1/dev/mii/atphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/attansic_l1/dev/mii/atphy.c rename to src/add-ons/kernel/drivers/network/ether/attansic_l1/dev/mii/atphy.c diff --git a/src/add-ons/kernel/drivers/network/attansic_l1/dev/mii/atphyreg.h b/src/add-ons/kernel/drivers/network/ether/attansic_l1/dev/mii/atphyreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/attansic_l1/dev/mii/atphyreg.h rename to src/add-ons/kernel/drivers/network/ether/attansic_l1/dev/mii/atphyreg.h diff --git a/src/add-ons/kernel/drivers/network/attansic_l1/glue.c b/src/add-ons/kernel/drivers/network/ether/attansic_l1/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/attansic_l1/glue.c rename to src/add-ons/kernel/drivers/network/ether/attansic_l1/glue.c diff --git a/src/add-ons/kernel/drivers/network/attansic_l2/Jamfile b/src/add-ons/kernel/drivers/network/ether/attansic_l2/Jamfile similarity index 89% rename from src/add-ons/kernel/drivers/network/attansic_l2/Jamfile rename to src/add-ons/kernel/drivers/network/ether/attansic_l2/Jamfile index 3f8136bf55..5fcebcb403 100644 --- a/src/add-ons/kernel/drivers/network/attansic_l2/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/attansic_l2/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network attansic_l2 ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether attansic_l2 ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; diff --git a/src/add-ons/kernel/drivers/network/attansic_l2/dev/ae/if_ae.c b/src/add-ons/kernel/drivers/network/ether/attansic_l2/dev/ae/if_ae.c similarity index 100% rename from src/add-ons/kernel/drivers/network/attansic_l2/dev/ae/if_ae.c rename to src/add-ons/kernel/drivers/network/ether/attansic_l2/dev/ae/if_ae.c diff --git a/src/add-ons/kernel/drivers/network/attansic_l2/dev/ae/if_aereg.h b/src/add-ons/kernel/drivers/network/ether/attansic_l2/dev/ae/if_aereg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/attansic_l2/dev/ae/if_aereg.h rename to src/add-ons/kernel/drivers/network/ether/attansic_l2/dev/ae/if_aereg.h diff --git a/src/add-ons/kernel/drivers/network/attansic_l2/dev/ae/if_aevar.h b/src/add-ons/kernel/drivers/network/ether/attansic_l2/dev/ae/if_aevar.h similarity index 100% rename from src/add-ons/kernel/drivers/network/attansic_l2/dev/ae/if_aevar.h rename to src/add-ons/kernel/drivers/network/ether/attansic_l2/dev/ae/if_aevar.h diff --git a/src/add-ons/kernel/drivers/network/attansic_l2/dev/mii/ukphy.c b/src/add-ons/kernel/drivers/network/ether/attansic_l2/dev/mii/ukphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/attansic_l2/dev/mii/ukphy.c rename to src/add-ons/kernel/drivers/network/ether/attansic_l2/dev/mii/ukphy.c diff --git a/src/add-ons/kernel/drivers/network/attansic_l2/dev/mii/ukphy_subr.c b/src/add-ons/kernel/drivers/network/ether/attansic_l2/dev/mii/ukphy_subr.c similarity index 100% rename from src/add-ons/kernel/drivers/network/attansic_l2/dev/mii/ukphy_subr.c rename to src/add-ons/kernel/drivers/network/ether/attansic_l2/dev/mii/ukphy_subr.c diff --git a/src/add-ons/kernel/drivers/network/attansic_l2/glue.c b/src/add-ons/kernel/drivers/network/ether/attansic_l2/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/attansic_l2/glue.c rename to src/add-ons/kernel/drivers/network/ether/attansic_l2/glue.c diff --git a/src/add-ons/kernel/drivers/network/broadcom440x/Jamfile b/src/add-ons/kernel/drivers/network/ether/broadcom440x/Jamfile similarity index 89% rename from src/add-ons/kernel/drivers/network/broadcom440x/Jamfile rename to src/add-ons/kernel/drivers/network/ether/broadcom440x/Jamfile index ef673be2ae..a04bdd17d8 100644 --- a/src/add-ons/kernel/drivers/network/broadcom440x/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/broadcom440x/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network broadcom440x ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether broadcom440x ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; diff --git a/src/add-ons/kernel/drivers/network/broadcom440x/dev/bfe/if_bfe.c b/src/add-ons/kernel/drivers/network/ether/broadcom440x/dev/bfe/if_bfe.c similarity index 100% rename from src/add-ons/kernel/drivers/network/broadcom440x/dev/bfe/if_bfe.c rename to src/add-ons/kernel/drivers/network/ether/broadcom440x/dev/bfe/if_bfe.c diff --git a/src/add-ons/kernel/drivers/network/broadcom440x/dev/bfe/if_bfereg.h b/src/add-ons/kernel/drivers/network/ether/broadcom440x/dev/bfe/if_bfereg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/broadcom440x/dev/bfe/if_bfereg.h rename to src/add-ons/kernel/drivers/network/ether/broadcom440x/dev/bfe/if_bfereg.h diff --git a/src/add-ons/kernel/drivers/network/broadcom440x/dev/mii/bmtphy.c b/src/add-ons/kernel/drivers/network/ether/broadcom440x/dev/mii/bmtphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/broadcom440x/dev/mii/bmtphy.c rename to src/add-ons/kernel/drivers/network/ether/broadcom440x/dev/mii/bmtphy.c diff --git a/src/add-ons/kernel/drivers/network/broadcom440x/dev/mii/bmtphyreg.h b/src/add-ons/kernel/drivers/network/ether/broadcom440x/dev/mii/bmtphyreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/broadcom440x/dev/mii/bmtphyreg.h rename to src/add-ons/kernel/drivers/network/ether/broadcom440x/dev/mii/bmtphyreg.h diff --git a/src/add-ons/kernel/drivers/network/broadcom440x/glue.c b/src/add-ons/kernel/drivers/network/ether/broadcom440x/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/broadcom440x/glue.c rename to src/add-ons/kernel/drivers/network/ether/broadcom440x/glue.c diff --git a/src/add-ons/kernel/drivers/network/broadcom570x/Jamfile b/src/add-ons/kernel/drivers/network/ether/broadcom570x/Jamfile similarity index 91% rename from src/add-ons/kernel/drivers/network/broadcom570x/Jamfile rename to src/add-ons/kernel/drivers/network/ether/broadcom570x/Jamfile index 57a3b83d0b..49aa0c69eb 100644 --- a/src/add-ons/kernel/drivers/network/broadcom570x/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/broadcom570x/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network broadcom570x ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether broadcom570x ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; diff --git a/src/add-ons/kernel/drivers/network/broadcom570x/dev/bce/if_bcereg.h b/src/add-ons/kernel/drivers/network/ether/broadcom570x/dev/bce/if_bcereg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/broadcom570x/dev/bce/if_bcereg.h rename to src/add-ons/kernel/drivers/network/ether/broadcom570x/dev/bce/if_bcereg.h diff --git a/src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/if_bge.c b/src/add-ons/kernel/drivers/network/ether/broadcom570x/dev/bge/if_bge.c similarity index 100% rename from src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/if_bge.c rename to src/add-ons/kernel/drivers/network/ether/broadcom570x/dev/bge/if_bge.c diff --git a/src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/if_bgereg.h b/src/add-ons/kernel/drivers/network/ether/broadcom570x/dev/bge/if_bgereg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/if_bgereg.h rename to src/add-ons/kernel/drivers/network/ether/broadcom570x/dev/bge/if_bgereg.h diff --git a/src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/brgphy.c b/src/add-ons/kernel/drivers/network/ether/broadcom570x/dev/mii/brgphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/brgphy.c rename to src/add-ons/kernel/drivers/network/ether/broadcom570x/dev/mii/brgphy.c diff --git a/src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/brgphyreg.h b/src/add-ons/kernel/drivers/network/ether/broadcom570x/dev/mii/brgphyreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/brgphyreg.h rename to src/add-ons/kernel/drivers/network/ether/broadcom570x/dev/mii/brgphyreg.h diff --git a/src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/ukphy.c b/src/add-ons/kernel/drivers/network/ether/broadcom570x/dev/mii/ukphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/ukphy.c rename to src/add-ons/kernel/drivers/network/ether/broadcom570x/dev/mii/ukphy.c diff --git a/src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/ukphy_subr.c b/src/add-ons/kernel/drivers/network/ether/broadcom570x/dev/mii/ukphy_subr.c similarity index 100% rename from src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/ukphy_subr.c rename to src/add-ons/kernel/drivers/network/ether/broadcom570x/dev/mii/ukphy_subr.c diff --git a/src/add-ons/kernel/drivers/network/broadcom570x/glue.c b/src/add-ons/kernel/drivers/network/ether/broadcom570x/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/broadcom570x/glue.c rename to src/add-ons/kernel/drivers/network/ether/broadcom570x/glue.c diff --git a/src/add-ons/kernel/drivers/network/dec21xxx/Jamfile b/src/add-ons/kernel/drivers/network/ether/dec21xxx/Jamfile similarity index 93% rename from src/add-ons/kernel/drivers/network/dec21xxx/Jamfile rename to src/add-ons/kernel/drivers/network/ether/dec21xxx/Jamfile index 3701ba3b41..94a646af3b 100644 --- a/src/add-ons/kernel/drivers/network/dec21xxx/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/dec21xxx/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network dec21xxx ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether dec21xxx ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] diff --git a/src/add-ons/kernel/drivers/network/dec21xxx/dev/dc/dcphy.c b/src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/dc/dcphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/dec21xxx/dev/dc/dcphy.c rename to src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/dc/dcphy.c diff --git a/src/add-ons/kernel/drivers/network/dec21xxx/dev/dc/if_dc.c b/src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/dc/if_dc.c similarity index 100% rename from src/add-ons/kernel/drivers/network/dec21xxx/dev/dc/if_dc.c rename to src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/dc/if_dc.c diff --git a/src/add-ons/kernel/drivers/network/dec21xxx/dev/dc/if_dcreg.h b/src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/dc/if_dcreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/dec21xxx/dev/dc/if_dcreg.h rename to src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/dc/if_dcreg.h diff --git a/src/add-ons/kernel/drivers/network/dec21xxx/dev/dc/pnphy.c b/src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/dc/pnphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/dec21xxx/dev/dc/pnphy.c rename to src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/dc/pnphy.c diff --git a/src/add-ons/kernel/drivers/network/dec21xxx/dev/de/dc21040reg.h b/src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/de/dc21040reg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/dec21xxx/dev/de/dc21040reg.h rename to src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/de/dc21040reg.h diff --git a/src/add-ons/kernel/drivers/network/dec21xxx/dev/de/if_de.c b/src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/de/if_de.c similarity index 100% rename from src/add-ons/kernel/drivers/network/dec21xxx/dev/de/if_de.c rename to src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/de/if_de.c diff --git a/src/add-ons/kernel/drivers/network/dec21xxx/dev/de/if_devar.h b/src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/de/if_devar.h similarity index 100% rename from src/add-ons/kernel/drivers/network/dec21xxx/dev/de/if_devar.h rename to src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/de/if_devar.h diff --git a/src/add-ons/kernel/drivers/network/dec21xxx/dev/mii/acphy.c b/src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/mii/acphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/dec21xxx/dev/mii/acphy.c rename to src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/mii/acphy.c diff --git a/src/add-ons/kernel/drivers/network/dec21xxx/dev/mii/acphyreg.h b/src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/mii/acphyreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/dec21xxx/dev/mii/acphyreg.h rename to src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/mii/acphyreg.h diff --git a/src/add-ons/kernel/drivers/network/dec21xxx/dev/mii/amphy.c b/src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/mii/amphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/dec21xxx/dev/mii/amphy.c rename to src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/mii/amphy.c diff --git a/src/add-ons/kernel/drivers/network/dec21xxx/dev/mii/amphyreg.h b/src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/mii/amphyreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/dec21xxx/dev/mii/amphyreg.h rename to src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/mii/amphyreg.h diff --git a/src/add-ons/kernel/drivers/network/dec21xxx/dev/mii/ukphy.c b/src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/mii/ukphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/dec21xxx/dev/mii/ukphy.c rename to src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/mii/ukphy.c diff --git a/src/add-ons/kernel/drivers/network/dec21xxx/dev/mii/ukphy_subr.c b/src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/mii/ukphy_subr.c similarity index 100% rename from src/add-ons/kernel/drivers/network/dec21xxx/dev/mii/ukphy_subr.c rename to src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/mii/ukphy_subr.c diff --git a/src/add-ons/kernel/drivers/network/dec21xxx/glue.c b/src/add-ons/kernel/drivers/network/ether/dec21xxx/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/dec21xxx/glue.c rename to src/add-ons/kernel/drivers/network/ether/dec21xxx/glue.c diff --git a/src/add-ons/kernel/drivers/network/dec21xxx/glue_de.c b/src/add-ons/kernel/drivers/network/ether/dec21xxx/glue_de.c similarity index 100% rename from src/add-ons/kernel/drivers/network/dec21xxx/glue_de.c rename to src/add-ons/kernel/drivers/network/ether/dec21xxx/glue_de.c diff --git a/src/add-ons/kernel/drivers/network/emulex_oce/Jamfile b/src/add-ons/kernel/drivers/network/ether/emulex_oce/Jamfile similarity index 86% rename from src/add-ons/kernel/drivers/network/emulex_oce/Jamfile rename to src/add-ons/kernel/drivers/network/ether/emulex_oce/Jamfile index afa139a960..42798f2cdb 100644 --- a/src/add-ons/kernel/drivers/network/emulex_oce/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/emulex_oce/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network emulex_oce ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether emulex_oce ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; diff --git a/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_hw.c b/src/add-ons/kernel/drivers/network/ether/emulex_oce/dev/oce/oce_hw.c similarity index 100% rename from src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_hw.c rename to src/add-ons/kernel/drivers/network/ether/emulex_oce/dev/oce/oce_hw.c diff --git a/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_hw.h b/src/add-ons/kernel/drivers/network/ether/emulex_oce/dev/oce/oce_hw.h similarity index 100% rename from src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_hw.h rename to src/add-ons/kernel/drivers/network/ether/emulex_oce/dev/oce/oce_hw.h diff --git a/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_if.c b/src/add-ons/kernel/drivers/network/ether/emulex_oce/dev/oce/oce_if.c similarity index 100% rename from src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_if.c rename to src/add-ons/kernel/drivers/network/ether/emulex_oce/dev/oce/oce_if.c diff --git a/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_if.h b/src/add-ons/kernel/drivers/network/ether/emulex_oce/dev/oce/oce_if.h similarity index 100% rename from src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_if.h rename to src/add-ons/kernel/drivers/network/ether/emulex_oce/dev/oce/oce_if.h diff --git a/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_mbox.c b/src/add-ons/kernel/drivers/network/ether/emulex_oce/dev/oce/oce_mbox.c similarity index 100% rename from src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_mbox.c rename to src/add-ons/kernel/drivers/network/ether/emulex_oce/dev/oce/oce_mbox.c diff --git a/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_queue.c b/src/add-ons/kernel/drivers/network/ether/emulex_oce/dev/oce/oce_queue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_queue.c rename to src/add-ons/kernel/drivers/network/ether/emulex_oce/dev/oce/oce_queue.c diff --git a/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_sysctl.c b/src/add-ons/kernel/drivers/network/ether/emulex_oce/dev/oce/oce_sysctl.c similarity index 100% rename from src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_sysctl.c rename to src/add-ons/kernel/drivers/network/ether/emulex_oce/dev/oce/oce_sysctl.c diff --git a/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_user.h b/src/add-ons/kernel/drivers/network/ether/emulex_oce/dev/oce/oce_user.h similarity index 100% rename from src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_user.h rename to src/add-ons/kernel/drivers/network/ether/emulex_oce/dev/oce/oce_user.h diff --git a/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_util.c b/src/add-ons/kernel/drivers/network/ether/emulex_oce/dev/oce/oce_util.c similarity index 100% rename from src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_util.c rename to src/add-ons/kernel/drivers/network/ether/emulex_oce/dev/oce/oce_util.c diff --git a/src/add-ons/kernel/drivers/network/emulex_oce/glue.c b/src/add-ons/kernel/drivers/network/ether/emulex_oce/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/emulex_oce/glue.c rename to src/add-ons/kernel/drivers/network/ether/emulex_oce/glue.c diff --git a/src/add-ons/kernel/drivers/network/etherpci/Jamfile b/src/add-ons/kernel/drivers/network/ether/etherpci/Jamfile similarity index 57% rename from src/add-ons/kernel/drivers/network/etherpci/Jamfile rename to src/add-ons/kernel/drivers/network/ether/etherpci/Jamfile index d5782862ce..aaa9292548 100644 --- a/src/add-ons/kernel/drivers/network/etherpci/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/etherpci/Jamfile @@ -1,21 +1,21 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network etherpci ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether etherpci ; # For ether_driver.h UsePrivateHeaders net ; KernelAddon etherpci : - etherpci.c + etherpci.c ; # Installation -HaikuInstall install-networking : /boot/home/config/add-ons/kernel/drivers/bin : +HaikuInstall install-networking : /boot/home/config/add-ons/kernel/drivers/bin : etherpci ; -HaikuInstallRelSymLink install-networking : /boot/home/config/add-ons/kernel/drivers/dev/net : - etherpci : - installed-symlink +HaikuInstallRelSymLink install-networking : /boot/home/config/add-ons/kernel/drivers/dev/net : + etherpci : + installed-symlink ; diff --git a/src/add-ons/kernel/drivers/network/etherpci/etherpci.c b/src/add-ons/kernel/drivers/network/ether/etherpci/etherpci.c similarity index 100% rename from src/add-ons/kernel/drivers/network/etherpci/etherpci.c rename to src/add-ons/kernel/drivers/network/ether/etherpci/etherpci.c diff --git a/src/add-ons/kernel/drivers/network/etherpci/etherpci_private.h b/src/add-ons/kernel/drivers/network/ether/etherpci/etherpci_private.h similarity index 100% rename from src/add-ons/kernel/drivers/network/etherpci/etherpci_private.h rename to src/add-ons/kernel/drivers/network/ether/etherpci/etherpci_private.h diff --git a/src/add-ons/kernel/drivers/network/ipro100/Jamfile b/src/add-ons/kernel/drivers/network/ether/ipro100/Jamfile similarity index 89% rename from src/add-ons/kernel/drivers/network/ipro100/Jamfile rename to src/add-ons/kernel/drivers/network/ether/ipro100/Jamfile index c29aa66e3c..d58d28348b 100644 --- a/src/add-ons/kernel/drivers/network/ipro100/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/ipro100/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network ipro100 ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether ipro100 ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; diff --git a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/if_fxp.c b/src/add-ons/kernel/drivers/network/ether/ipro100/dev/fxp/if_fxp.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro100/dev/fxp/if_fxp.c rename to src/add-ons/kernel/drivers/network/ether/ipro100/dev/fxp/if_fxp.c diff --git a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/if_fxpreg.h b/src/add-ons/kernel/drivers/network/ether/ipro100/dev/fxp/if_fxpreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro100/dev/fxp/if_fxpreg.h rename to src/add-ons/kernel/drivers/network/ether/ipro100/dev/fxp/if_fxpreg.h diff --git a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/if_fxpvar.h b/src/add-ons/kernel/drivers/network/ether/ipro100/dev/fxp/if_fxpvar.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro100/dev/fxp/if_fxpvar.h rename to src/add-ons/kernel/drivers/network/ether/ipro100/dev/fxp/if_fxpvar.h diff --git a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/inphy.c b/src/add-ons/kernel/drivers/network/ether/ipro100/dev/fxp/inphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro100/dev/fxp/inphy.c rename to src/add-ons/kernel/drivers/network/ether/ipro100/dev/fxp/inphy.c diff --git a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/inphyreg.h b/src/add-ons/kernel/drivers/network/ether/ipro100/dev/fxp/inphyreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro100/dev/fxp/inphyreg.h rename to src/add-ons/kernel/drivers/network/ether/ipro100/dev/fxp/inphyreg.h diff --git a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/rcvbundl.h b/src/add-ons/kernel/drivers/network/ether/ipro100/dev/fxp/rcvbundl.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro100/dev/fxp/rcvbundl.h rename to src/add-ons/kernel/drivers/network/ether/ipro100/dev/fxp/rcvbundl.h diff --git a/src/add-ons/kernel/drivers/network/ipro100/glue.c b/src/add-ons/kernel/drivers/network/ether/ipro100/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro100/glue.c rename to src/add-ons/kernel/drivers/network/ether/ipro100/glue.c diff --git a/src/add-ons/kernel/drivers/network/ipro1000/Jamfile b/src/add-ons/kernel/drivers/network/ether/ipro1000/Jamfile similarity index 91% rename from src/add-ons/kernel/drivers/network/ipro1000/Jamfile rename to src/add-ons/kernel/drivers/network/ether/ipro1000/Jamfile index cd1e3e5f73..6c5c38e1f2 100644 --- a/src/add-ons/kernel/drivers/network/ipro1000/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/ipro1000/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network ipro1000 ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether ipro1000 ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_iflib compat ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/LICENSE b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/LICENSE similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/LICENSE rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/LICENSE diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_80003es2lan.c b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_80003es2lan.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_80003es2lan.c rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_80003es2lan.c diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_80003es2lan.h b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_80003es2lan.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_80003es2lan.h rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_80003es2lan.h diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_82540.c b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_82540.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_82540.c rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_82540.c diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_82541.c b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_82541.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_82541.c rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_82541.c diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_82541.h b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_82541.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_82541.h rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_82541.h diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_82542.c b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_82542.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_82542.c rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_82542.c diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_82543.c b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_82543.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_82543.c rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_82543.c diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_82543.h b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_82543.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_82543.h rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_82543.h diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_82571.c b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_82571.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_82571.c rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_82571.c diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_82571.h b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_82571.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_82571.h rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_82571.h diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_82575.c b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_82575.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_82575.c rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_82575.c diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_82575.h b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_82575.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_82575.h rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_82575.h diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_api.c b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_api.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_api.c rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_api.c diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_api.h b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_api.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_api.h rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_api.h diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_defines.h b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_defines.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_defines.h rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_defines.h diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_hw.h b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_hw.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_hw.h rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_hw.h diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_i210.c b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_i210.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_i210.c rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_i210.c diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_i210.h b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_i210.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_i210.h rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_i210.h diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_ich8lan.c b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_ich8lan.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_ich8lan.c rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_ich8lan.c diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_ich8lan.h b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_ich8lan.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_ich8lan.h rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_ich8lan.h diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_mac.c b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_mac.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_mac.c rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_mac.c diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_mac.h b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_mac.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_mac.h rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_mac.h diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_manage.c b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_manage.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_manage.c rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_manage.c diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_manage.h b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_manage.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_manage.h rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_manage.h diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_mbx.c b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_mbx.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_mbx.c rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_mbx.c diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_mbx.h b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_mbx.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_mbx.h rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_mbx.h diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_nvm.c b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_nvm.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_nvm.c rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_nvm.c diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_nvm.h b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_nvm.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_nvm.h rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_nvm.h diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_osdep.c b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_osdep.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_osdep.c rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_osdep.c diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_osdep.h b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_osdep.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_osdep.h rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_osdep.h diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_phy.c b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_phy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_phy.c rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_phy.c diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_phy.h b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_phy.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_phy.h rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_phy.h diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_regs.h b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_regs.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_regs.h rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_regs.h diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_vf.c b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_vf.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_vf.c rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_vf.c diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_vf.h b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_vf.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/e1000_vf.h rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/e1000_vf.h diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/em_txrx.c b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/em_txrx.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/em_txrx.c rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/em_txrx.c diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/if_em.c b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/if_em.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/if_em.c rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/if_em.c diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/if_em.h b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/if_em.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/if_em.h rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/if_em.h diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/igb_txrx.c b/src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/igb_txrx.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/igb_txrx.c rename to src/add-ons/kernel/drivers/network/ether/ipro1000/dev/e1000/igb_txrx.c diff --git a/src/add-ons/kernel/drivers/network/ipro1000/glue.c b/src/add-ons/kernel/drivers/network/ether/ipro1000/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro1000/glue.c rename to src/add-ons/kernel/drivers/network/ether/ipro1000/glue.c diff --git a/src/add-ons/kernel/drivers/network/jmicron2x0/Jamfile b/src/add-ons/kernel/drivers/network/ether/jmicron2x0/Jamfile similarity index 89% rename from src/add-ons/kernel/drivers/network/jmicron2x0/Jamfile rename to src/add-ons/kernel/drivers/network/ether/jmicron2x0/Jamfile index 40f3cd4062..abbf6136de 100644 --- a/src/add-ons/kernel/drivers/network/jmicron2x0/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/jmicron2x0/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network jmicron2x0 ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether jmicron2x0 ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; diff --git a/src/add-ons/kernel/drivers/network/jmicron2x0/dev/jme/if_jme.c b/src/add-ons/kernel/drivers/network/ether/jmicron2x0/dev/jme/if_jme.c similarity index 100% rename from src/add-ons/kernel/drivers/network/jmicron2x0/dev/jme/if_jme.c rename to src/add-ons/kernel/drivers/network/ether/jmicron2x0/dev/jme/if_jme.c diff --git a/src/add-ons/kernel/drivers/network/jmicron2x0/dev/jme/if_jmereg.h b/src/add-ons/kernel/drivers/network/ether/jmicron2x0/dev/jme/if_jmereg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/jmicron2x0/dev/jme/if_jmereg.h rename to src/add-ons/kernel/drivers/network/ether/jmicron2x0/dev/jme/if_jmereg.h diff --git a/src/add-ons/kernel/drivers/network/jmicron2x0/dev/jme/if_jmevar.h b/src/add-ons/kernel/drivers/network/ether/jmicron2x0/dev/jme/if_jmevar.h similarity index 100% rename from src/add-ons/kernel/drivers/network/jmicron2x0/dev/jme/if_jmevar.h rename to src/add-ons/kernel/drivers/network/ether/jmicron2x0/dev/jme/if_jmevar.h diff --git a/src/add-ons/kernel/drivers/network/jmicron2x0/dev/mii/jmphy.c b/src/add-ons/kernel/drivers/network/ether/jmicron2x0/dev/mii/jmphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/jmicron2x0/dev/mii/jmphy.c rename to src/add-ons/kernel/drivers/network/ether/jmicron2x0/dev/mii/jmphy.c diff --git a/src/add-ons/kernel/drivers/network/jmicron2x0/dev/mii/jmphyreg.h b/src/add-ons/kernel/drivers/network/ether/jmicron2x0/dev/mii/jmphyreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/jmicron2x0/dev/mii/jmphyreg.h rename to src/add-ons/kernel/drivers/network/ether/jmicron2x0/dev/mii/jmphyreg.h diff --git a/src/add-ons/kernel/drivers/network/jmicron2x0/glue.c b/src/add-ons/kernel/drivers/network/ether/jmicron2x0/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/jmicron2x0/glue.c rename to src/add-ons/kernel/drivers/network/ether/jmicron2x0/glue.c diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/Jamfile b/src/add-ons/kernel/drivers/network/ether/marvell_yukon/Jamfile similarity index 90% rename from src/add-ons/kernel/drivers/network/marvell_yukon/Jamfile rename to src/add-ons/kernel/drivers/network/ether/marvell_yukon/Jamfile index a49c8a04c3..96068a59ed 100644 --- a/src/add-ons/kernel/drivers/network/marvell_yukon/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/marvell_yukon/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network marvell_yukon ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether marvell_yukon ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/brgphyreg.h b/src/add-ons/kernel/drivers/network/ether/marvell_yukon/dev/mii/brgphyreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/brgphyreg.h rename to src/add-ons/kernel/drivers/network/ether/marvell_yukon/dev/mii/brgphyreg.h diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/e1000phy.c b/src/add-ons/kernel/drivers/network/ether/marvell_yukon/dev/mii/e1000phy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/e1000phy.c rename to src/add-ons/kernel/drivers/network/ether/marvell_yukon/dev/mii/e1000phy.c diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/e1000phyreg.h b/src/add-ons/kernel/drivers/network/ether/marvell_yukon/dev/mii/e1000phyreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/e1000phyreg.h rename to src/add-ons/kernel/drivers/network/ether/marvell_yukon/dev/mii/e1000phyreg.h diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/ukphy.c b/src/add-ons/kernel/drivers/network/ether/marvell_yukon/dev/mii/ukphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/ukphy.c rename to src/add-ons/kernel/drivers/network/ether/marvell_yukon/dev/mii/ukphy.c diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/ukphy_subr.c b/src/add-ons/kernel/drivers/network/ether/marvell_yukon/dev/mii/ukphy_subr.c similarity index 100% rename from src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/ukphy_subr.c rename to src/add-ons/kernel/drivers/network/ether/marvell_yukon/dev/mii/ukphy_subr.c diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/if_msk.c b/src/add-ons/kernel/drivers/network/ether/marvell_yukon/dev/msk/if_msk.c similarity index 100% rename from src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/if_msk.c rename to src/add-ons/kernel/drivers/network/ether/marvell_yukon/dev/msk/if_msk.c diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/if_mskreg.h b/src/add-ons/kernel/drivers/network/ether/marvell_yukon/dev/msk/if_mskreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/if_mskreg.h rename to src/add-ons/kernel/drivers/network/ether/marvell_yukon/dev/msk/if_mskreg.h diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/glue.c b/src/add-ons/kernel/drivers/network/ether/marvell_yukon/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/marvell_yukon/glue.c rename to src/add-ons/kernel/drivers/network/ether/marvell_yukon/glue.c diff --git a/src/add-ons/kernel/drivers/network/nforce/Jamfile b/src/add-ons/kernel/drivers/network/ether/nforce/Jamfile similarity index 90% rename from src/add-ons/kernel/drivers/network/nforce/Jamfile rename to src/add-ons/kernel/drivers/network/ether/nforce/Jamfile index 57df79681c..66276c3d05 100644 --- a/src/add-ons/kernel/drivers/network/nforce/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/nforce/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network nforce ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether nforce ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; diff --git a/src/add-ons/kernel/drivers/network/nforce/dev/mii/ciphy.c b/src/add-ons/kernel/drivers/network/ether/nforce/dev/mii/ciphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/nforce/dev/mii/ciphy.c rename to src/add-ons/kernel/drivers/network/ether/nforce/dev/mii/ciphy.c diff --git a/src/add-ons/kernel/drivers/network/nforce/dev/mii/ciphyreg.h b/src/add-ons/kernel/drivers/network/ether/nforce/dev/mii/ciphyreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/nforce/dev/mii/ciphyreg.h rename to src/add-ons/kernel/drivers/network/ether/nforce/dev/mii/ciphyreg.h diff --git a/src/add-ons/kernel/drivers/network/nforce/dev/mii/ukphy.c b/src/add-ons/kernel/drivers/network/ether/nforce/dev/mii/ukphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/nforce/dev/mii/ukphy.c rename to src/add-ons/kernel/drivers/network/ether/nforce/dev/mii/ukphy.c diff --git a/src/add-ons/kernel/drivers/network/nforce/dev/mii/ukphy_subr.c b/src/add-ons/kernel/drivers/network/ether/nforce/dev/mii/ukphy_subr.c similarity index 100% rename from src/add-ons/kernel/drivers/network/nforce/dev/mii/ukphy_subr.c rename to src/add-ons/kernel/drivers/network/ether/nforce/dev/mii/ukphy_subr.c diff --git a/src/add-ons/kernel/drivers/network/nforce/dev/nfe/if_nfe.c b/src/add-ons/kernel/drivers/network/ether/nforce/dev/nfe/if_nfe.c similarity index 100% rename from src/add-ons/kernel/drivers/network/nforce/dev/nfe/if_nfe.c rename to src/add-ons/kernel/drivers/network/ether/nforce/dev/nfe/if_nfe.c diff --git a/src/add-ons/kernel/drivers/network/nforce/dev/nfe/if_nfereg.h b/src/add-ons/kernel/drivers/network/ether/nforce/dev/nfe/if_nfereg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/nforce/dev/nfe/if_nfereg.h rename to src/add-ons/kernel/drivers/network/ether/nforce/dev/nfe/if_nfereg.h diff --git a/src/add-ons/kernel/drivers/network/nforce/dev/nfe/if_nfevar.h b/src/add-ons/kernel/drivers/network/ether/nforce/dev/nfe/if_nfevar.h similarity index 100% rename from src/add-ons/kernel/drivers/network/nforce/dev/nfe/if_nfevar.h rename to src/add-ons/kernel/drivers/network/ether/nforce/dev/nfe/if_nfevar.h diff --git a/src/add-ons/kernel/drivers/network/nforce/glue.c b/src/add-ons/kernel/drivers/network/ether/nforce/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/nforce/glue.c rename to src/add-ons/kernel/drivers/network/ether/nforce/glue.c diff --git a/src/add-ons/kernel/drivers/network/pcnet/Jamfile b/src/add-ons/kernel/drivers/network/ether/pcnet/Jamfile similarity index 93% rename from src/add-ons/kernel/drivers/network/pcnet/Jamfile rename to src/add-ons/kernel/drivers/network/ether/pcnet/Jamfile index 902d8c5fa3..9161947a77 100644 --- a/src/add-ons/kernel/drivers/network/pcnet/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/pcnet/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network pcnet ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether pcnet ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/am7990.c b/src/add-ons/kernel/drivers/network/ether/pcnet/dev/le/am7990.c similarity index 100% rename from src/add-ons/kernel/drivers/network/pcnet/dev/le/am7990.c rename to src/add-ons/kernel/drivers/network/ether/pcnet/dev/le/am7990.c diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/am79900.c b/src/add-ons/kernel/drivers/network/ether/pcnet/dev/le/am79900.c similarity index 100% rename from src/add-ons/kernel/drivers/network/pcnet/dev/le/am79900.c rename to src/add-ons/kernel/drivers/network/ether/pcnet/dev/le/am79900.c diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/am79900reg.h b/src/add-ons/kernel/drivers/network/ether/pcnet/dev/le/am79900reg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/pcnet/dev/le/am79900reg.h rename to src/add-ons/kernel/drivers/network/ether/pcnet/dev/le/am79900reg.h diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/am79900var.h b/src/add-ons/kernel/drivers/network/ether/pcnet/dev/le/am79900var.h similarity index 100% rename from src/add-ons/kernel/drivers/network/pcnet/dev/le/am79900var.h rename to src/add-ons/kernel/drivers/network/ether/pcnet/dev/le/am79900var.h diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/am7990reg.h b/src/add-ons/kernel/drivers/network/ether/pcnet/dev/le/am7990reg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/pcnet/dev/le/am7990reg.h rename to src/add-ons/kernel/drivers/network/ether/pcnet/dev/le/am7990reg.h diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/am7990var.h b/src/add-ons/kernel/drivers/network/ether/pcnet/dev/le/am7990var.h similarity index 100% rename from src/add-ons/kernel/drivers/network/pcnet/dev/le/am7990var.h rename to src/add-ons/kernel/drivers/network/ether/pcnet/dev/le/am7990var.h diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/if_le_ledma.c b/src/add-ons/kernel/drivers/network/ether/pcnet/dev/le/if_le_ledma.c similarity index 100% rename from src/add-ons/kernel/drivers/network/pcnet/dev/le/if_le_ledma.c rename to src/add-ons/kernel/drivers/network/ether/pcnet/dev/le/if_le_ledma.c diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/if_le_pci.c b/src/add-ons/kernel/drivers/network/ether/pcnet/dev/le/if_le_pci.c similarity index 100% rename from src/add-ons/kernel/drivers/network/pcnet/dev/le/if_le_pci.c rename to src/add-ons/kernel/drivers/network/ether/pcnet/dev/le/if_le_pci.c diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/lance.c b/src/add-ons/kernel/drivers/network/ether/pcnet/dev/le/lance.c similarity index 100% rename from src/add-ons/kernel/drivers/network/pcnet/dev/le/lance.c rename to src/add-ons/kernel/drivers/network/ether/pcnet/dev/le/lance.c diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/lancereg.h b/src/add-ons/kernel/drivers/network/ether/pcnet/dev/le/lancereg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/pcnet/dev/le/lancereg.h rename to src/add-ons/kernel/drivers/network/ether/pcnet/dev/le/lancereg.h diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/lancevar.h b/src/add-ons/kernel/drivers/network/ether/pcnet/dev/le/lancevar.h similarity index 100% rename from src/add-ons/kernel/drivers/network/pcnet/dev/le/lancevar.h rename to src/add-ons/kernel/drivers/network/ether/pcnet/dev/le/lancevar.h diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/mii/nsphy.c b/src/add-ons/kernel/drivers/network/ether/pcnet/dev/mii/nsphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/pcnet/dev/mii/nsphy.c rename to src/add-ons/kernel/drivers/network/ether/pcnet/dev/mii/nsphy.c diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/mii/nsphyreg.h b/src/add-ons/kernel/drivers/network/ether/pcnet/dev/mii/nsphyreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/pcnet/dev/mii/nsphyreg.h rename to src/add-ons/kernel/drivers/network/ether/pcnet/dev/mii/nsphyreg.h diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/mii/nsphyter.c b/src/add-ons/kernel/drivers/network/ether/pcnet/dev/mii/nsphyter.c similarity index 100% rename from src/add-ons/kernel/drivers/network/pcnet/dev/mii/nsphyter.c rename to src/add-ons/kernel/drivers/network/ether/pcnet/dev/mii/nsphyter.c diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/mii/nsphyterreg.h b/src/add-ons/kernel/drivers/network/ether/pcnet/dev/mii/nsphyterreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/pcnet/dev/mii/nsphyterreg.h rename to src/add-ons/kernel/drivers/network/ether/pcnet/dev/mii/nsphyterreg.h diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/mii/ukphy.c b/src/add-ons/kernel/drivers/network/ether/pcnet/dev/mii/ukphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/pcnet/dev/mii/ukphy.c rename to src/add-ons/kernel/drivers/network/ether/pcnet/dev/mii/ukphy.c diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/mii/ukphy_subr.c b/src/add-ons/kernel/drivers/network/ether/pcnet/dev/mii/ukphy_subr.c similarity index 100% rename from src/add-ons/kernel/drivers/network/pcnet/dev/mii/ukphy_subr.c rename to src/add-ons/kernel/drivers/network/ether/pcnet/dev/mii/ukphy_subr.c diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/pcn/if_pcn.c b/src/add-ons/kernel/drivers/network/ether/pcnet/dev/pcn/if_pcn.c similarity index 100% rename from src/add-ons/kernel/drivers/network/pcnet/dev/pcn/if_pcn.c rename to src/add-ons/kernel/drivers/network/ether/pcnet/dev/pcn/if_pcn.c diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/pcn/if_pcnreg.h b/src/add-ons/kernel/drivers/network/ether/pcnet/dev/pcn/if_pcnreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/pcnet/dev/pcn/if_pcnreg.h rename to src/add-ons/kernel/drivers/network/ether/pcnet/dev/pcn/if_pcnreg.h diff --git a/src/add-ons/kernel/drivers/network/pcnet/glue.c b/src/add-ons/kernel/drivers/network/ether/pcnet/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/pcnet/glue.c rename to src/add-ons/kernel/drivers/network/ether/pcnet/glue.c diff --git a/src/add-ons/kernel/drivers/network/pcnet/glue_pcn.c b/src/add-ons/kernel/drivers/network/ether/pcnet/glue_pcn.c similarity index 100% rename from src/add-ons/kernel/drivers/network/pcnet/glue_pcn.c rename to src/add-ons/kernel/drivers/network/ether/pcnet/glue_pcn.c diff --git a/src/add-ons/kernel/drivers/network/pegasus/Jamfile b/src/add-ons/kernel/drivers/network/ether/pegasus/Jamfile similarity index 84% rename from src/add-ons/kernel/drivers/network/pegasus/Jamfile rename to src/add-ons/kernel/drivers/network/ether/pegasus/Jamfile index d517db7339..fc315f1d5e 100644 --- a/src/add-ons/kernel/drivers/network/pegasus/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/pegasus/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network pegasus ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether pegasus ; SubDirSysHdrs $(HAIKU_TOP) headers os drivers ; diff --git a/src/add-ons/kernel/drivers/network/pegasus/devlist.c b/src/add-ons/kernel/drivers/network/ether/pegasus/devlist.c similarity index 100% rename from src/add-ons/kernel/drivers/network/pegasus/devlist.c rename to src/add-ons/kernel/drivers/network/ether/pegasus/devlist.c diff --git a/src/add-ons/kernel/drivers/network/pegasus/driver.c b/src/add-ons/kernel/drivers/network/ether/pegasus/driver.c similarity index 100% rename from src/add-ons/kernel/drivers/network/pegasus/driver.c rename to src/add-ons/kernel/drivers/network/ether/pegasus/driver.c diff --git a/src/add-ons/kernel/drivers/network/pegasus/driver.h b/src/add-ons/kernel/drivers/network/ether/pegasus/driver.h similarity index 100% rename from src/add-ons/kernel/drivers/network/pegasus/driver.h rename to src/add-ons/kernel/drivers/network/ether/pegasus/driver.h diff --git a/src/add-ons/kernel/drivers/network/pegasus/if_aue.c b/src/add-ons/kernel/drivers/network/ether/pegasus/if_aue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/pegasus/if_aue.c rename to src/add-ons/kernel/drivers/network/ether/pegasus/if_aue.c diff --git a/src/add-ons/kernel/drivers/network/pegasus/if_auereg.h b/src/add-ons/kernel/drivers/network/ether/pegasus/if_auereg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/pegasus/if_auereg.h rename to src/add-ons/kernel/drivers/network/ether/pegasus/if_auereg.h diff --git a/src/add-ons/kernel/drivers/network/rdc/Jamfile b/src/add-ons/kernel/drivers/network/ether/rdc/Jamfile similarity index 90% rename from src/add-ons/kernel/drivers/network/rdc/Jamfile rename to src/add-ons/kernel/drivers/network/ether/rdc/Jamfile index 1501a6199c..9068809f77 100644 --- a/src/add-ons/kernel/drivers/network/rdc/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/rdc/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network rdc ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether rdc ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; diff --git a/src/add-ons/kernel/drivers/network/rdc/dev/mii/rdcphy.c b/src/add-ons/kernel/drivers/network/ether/rdc/dev/mii/rdcphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/rdc/dev/mii/rdcphy.c rename to src/add-ons/kernel/drivers/network/ether/rdc/dev/mii/rdcphy.c diff --git a/src/add-ons/kernel/drivers/network/rdc/dev/mii/rdcphyreg.h b/src/add-ons/kernel/drivers/network/ether/rdc/dev/mii/rdcphyreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/rdc/dev/mii/rdcphyreg.h rename to src/add-ons/kernel/drivers/network/ether/rdc/dev/mii/rdcphyreg.h diff --git a/src/add-ons/kernel/drivers/network/rdc/dev/vte/if_vte.c b/src/add-ons/kernel/drivers/network/ether/rdc/dev/vte/if_vte.c similarity index 100% rename from src/add-ons/kernel/drivers/network/rdc/dev/vte/if_vte.c rename to src/add-ons/kernel/drivers/network/ether/rdc/dev/vte/if_vte.c diff --git a/src/add-ons/kernel/drivers/network/rdc/dev/vte/if_vtereg.h b/src/add-ons/kernel/drivers/network/ether/rdc/dev/vte/if_vtereg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/rdc/dev/vte/if_vtereg.h rename to src/add-ons/kernel/drivers/network/ether/rdc/dev/vte/if_vtereg.h diff --git a/src/add-ons/kernel/drivers/network/rdc/dev/vte/if_vtevar.h b/src/add-ons/kernel/drivers/network/ether/rdc/dev/vte/if_vtevar.h similarity index 100% rename from src/add-ons/kernel/drivers/network/rdc/dev/vte/if_vtevar.h rename to src/add-ons/kernel/drivers/network/ether/rdc/dev/vte/if_vtevar.h diff --git a/src/add-ons/kernel/drivers/network/rdc/glue.c b/src/add-ons/kernel/drivers/network/ether/rdc/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/rdc/glue.c rename to src/add-ons/kernel/drivers/network/ether/rdc/glue.c diff --git a/src/add-ons/kernel/drivers/network/rtl8139/Jamfile b/src/add-ons/kernel/drivers/network/ether/rtl8139/Jamfile similarity index 90% rename from src/add-ons/kernel/drivers/network/rtl8139/Jamfile rename to src/add-ons/kernel/drivers/network/ether/rtl8139/Jamfile index b183cb2108..eb7ba5023c 100644 --- a/src/add-ons/kernel/drivers/network/rtl8139/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/rtl8139/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network rtl8139 ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether rtl8139 ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; diff --git a/src/add-ons/kernel/drivers/network/rtl8139/dev/mii/rlphy.c b/src/add-ons/kernel/drivers/network/ether/rtl8139/dev/mii/rlphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/rtl8139/dev/mii/rlphy.c rename to src/add-ons/kernel/drivers/network/ether/rtl8139/dev/mii/rlphy.c diff --git a/src/add-ons/kernel/drivers/network/rtl8139/dev/rl/if_rl.c b/src/add-ons/kernel/drivers/network/ether/rtl8139/dev/rl/if_rl.c similarity index 100% rename from src/add-ons/kernel/drivers/network/rtl8139/dev/rl/if_rl.c rename to src/add-ons/kernel/drivers/network/ether/rtl8139/dev/rl/if_rl.c diff --git a/src/add-ons/kernel/drivers/network/rtl8139/dev/rl/if_rlreg.h b/src/add-ons/kernel/drivers/network/ether/rtl8139/dev/rl/if_rlreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/rtl8139/dev/rl/if_rlreg.h rename to src/add-ons/kernel/drivers/network/ether/rtl8139/dev/rl/if_rlreg.h diff --git a/src/add-ons/kernel/drivers/network/rtl8139/glue.c b/src/add-ons/kernel/drivers/network/ether/rtl8139/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/rtl8139/glue.c rename to src/add-ons/kernel/drivers/network/ether/rtl8139/glue.c diff --git a/src/add-ons/kernel/drivers/network/rtl81xx/Jamfile b/src/add-ons/kernel/drivers/network/ether/rtl81xx/Jamfile similarity index 90% rename from src/add-ons/kernel/drivers/network/rtl81xx/Jamfile rename to src/add-ons/kernel/drivers/network/ether/rtl81xx/Jamfile index 9e88e08d11..dc30f811d3 100644 --- a/src/add-ons/kernel/drivers/network/rtl81xx/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/rtl81xx/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network rtl81xx ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether rtl81xx ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; diff --git a/src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/rgephy.c b/src/add-ons/kernel/drivers/network/ether/rtl81xx/dev/mii/rgephy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/rgephy.c rename to src/add-ons/kernel/drivers/network/ether/rtl81xx/dev/mii/rgephy.c diff --git a/src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/rgephyreg.h b/src/add-ons/kernel/drivers/network/ether/rtl81xx/dev/mii/rgephyreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/rgephyreg.h rename to src/add-ons/kernel/drivers/network/ether/rtl81xx/dev/mii/rgephyreg.h diff --git a/src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/rlphy.c b/src/add-ons/kernel/drivers/network/ether/rtl81xx/dev/mii/rlphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/rlphy.c rename to src/add-ons/kernel/drivers/network/ether/rtl81xx/dev/mii/rlphy.c diff --git a/src/add-ons/kernel/drivers/network/rtl81xx/dev/re/if_re.c b/src/add-ons/kernel/drivers/network/ether/rtl81xx/dev/re/if_re.c similarity index 100% rename from src/add-ons/kernel/drivers/network/rtl81xx/dev/re/if_re.c rename to src/add-ons/kernel/drivers/network/ether/rtl81xx/dev/re/if_re.c diff --git a/src/add-ons/kernel/drivers/network/rtl81xx/dev/rl/if_rlreg.h b/src/add-ons/kernel/drivers/network/ether/rtl81xx/dev/rl/if_rlreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/rtl81xx/dev/rl/if_rlreg.h rename to src/add-ons/kernel/drivers/network/ether/rtl81xx/dev/rl/if_rlreg.h diff --git a/src/add-ons/kernel/drivers/network/rtl81xx/glue.c b/src/add-ons/kernel/drivers/network/ether/rtl81xx/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/rtl81xx/glue.c rename to src/add-ons/kernel/drivers/network/ether/rtl81xx/glue.c diff --git a/src/add-ons/kernel/drivers/network/sis19x/Jamfile b/src/add-ons/kernel/drivers/network/ether/sis19x/Jamfile similarity index 91% rename from src/add-ons/kernel/drivers/network/sis19x/Jamfile rename to src/add-ons/kernel/drivers/network/ether/sis19x/Jamfile index b9817429ef..1313158013 100644 --- a/src/add-ons/kernel/drivers/network/sis19x/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/sis19x/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network sis19x ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether sis19x ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; diff --git a/src/add-ons/kernel/drivers/network/sis19x/dev/mii/ukphy.c b/src/add-ons/kernel/drivers/network/ether/sis19x/dev/mii/ukphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/sis19x/dev/mii/ukphy.c rename to src/add-ons/kernel/drivers/network/ether/sis19x/dev/mii/ukphy.c diff --git a/src/add-ons/kernel/drivers/network/sis19x/dev/mii/ukphy_subr.c b/src/add-ons/kernel/drivers/network/ether/sis19x/dev/mii/ukphy_subr.c similarity index 100% rename from src/add-ons/kernel/drivers/network/sis19x/dev/mii/ukphy_subr.c rename to src/add-ons/kernel/drivers/network/ether/sis19x/dev/mii/ukphy_subr.c diff --git a/src/add-ons/kernel/drivers/network/sis19x/dev/sge/if_sge.c b/src/add-ons/kernel/drivers/network/ether/sis19x/dev/sge/if_sge.c similarity index 100% rename from src/add-ons/kernel/drivers/network/sis19x/dev/sge/if_sge.c rename to src/add-ons/kernel/drivers/network/ether/sis19x/dev/sge/if_sge.c diff --git a/src/add-ons/kernel/drivers/network/sis19x/dev/sge/if_sgereg.h b/src/add-ons/kernel/drivers/network/ether/sis19x/dev/sge/if_sgereg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/sis19x/dev/sge/if_sgereg.h rename to src/add-ons/kernel/drivers/network/ether/sis19x/dev/sge/if_sgereg.h diff --git a/src/add-ons/kernel/drivers/network/sis19x/glue.c b/src/add-ons/kernel/drivers/network/ether/sis19x/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/sis19x/glue.c rename to src/add-ons/kernel/drivers/network/ether/sis19x/glue.c diff --git a/src/add-ons/kernel/drivers/network/sis900/Jamfile b/src/add-ons/kernel/drivers/network/ether/sis900/Jamfile similarity index 91% rename from src/add-ons/kernel/drivers/network/sis900/Jamfile rename to src/add-ons/kernel/drivers/network/ether/sis900/Jamfile index 6499aebdaa..4e1fe867f7 100644 --- a/src/add-ons/kernel/drivers/network/sis900/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/sis900/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network sis900 ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether sis900 ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; diff --git a/src/add-ons/kernel/drivers/network/sis900/dev/mii/icsphy.c b/src/add-ons/kernel/drivers/network/ether/sis900/dev/mii/icsphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/sis900/dev/mii/icsphy.c rename to src/add-ons/kernel/drivers/network/ether/sis900/dev/mii/icsphy.c diff --git a/src/add-ons/kernel/drivers/network/sis900/dev/mii/icsphyreg.h b/src/add-ons/kernel/drivers/network/ether/sis900/dev/mii/icsphyreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/sis900/dev/mii/icsphyreg.h rename to src/add-ons/kernel/drivers/network/ether/sis900/dev/mii/icsphyreg.h diff --git a/src/add-ons/kernel/drivers/network/sis900/dev/mii/nsphyter.c b/src/add-ons/kernel/drivers/network/ether/sis900/dev/mii/nsphyter.c similarity index 100% rename from src/add-ons/kernel/drivers/network/sis900/dev/mii/nsphyter.c rename to src/add-ons/kernel/drivers/network/ether/sis900/dev/mii/nsphyter.c diff --git a/src/add-ons/kernel/drivers/network/sis900/dev/mii/nsphyterreg.h b/src/add-ons/kernel/drivers/network/ether/sis900/dev/mii/nsphyterreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/sis900/dev/mii/nsphyterreg.h rename to src/add-ons/kernel/drivers/network/ether/sis900/dev/mii/nsphyterreg.h diff --git a/src/add-ons/kernel/drivers/network/sis900/dev/mii/ukphy.c b/src/add-ons/kernel/drivers/network/ether/sis900/dev/mii/ukphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/sis900/dev/mii/ukphy.c rename to src/add-ons/kernel/drivers/network/ether/sis900/dev/mii/ukphy.c diff --git a/src/add-ons/kernel/drivers/network/sis900/dev/mii/ukphy_subr.c b/src/add-ons/kernel/drivers/network/ether/sis900/dev/mii/ukphy_subr.c similarity index 100% rename from src/add-ons/kernel/drivers/network/sis900/dev/mii/ukphy_subr.c rename to src/add-ons/kernel/drivers/network/ether/sis900/dev/mii/ukphy_subr.c diff --git a/src/add-ons/kernel/drivers/network/sis900/dev/sis/if_sis.c b/src/add-ons/kernel/drivers/network/ether/sis900/dev/sis/if_sis.c similarity index 100% rename from src/add-ons/kernel/drivers/network/sis900/dev/sis/if_sis.c rename to src/add-ons/kernel/drivers/network/ether/sis900/dev/sis/if_sis.c diff --git a/src/add-ons/kernel/drivers/network/sis900/dev/sis/if_sisreg.h b/src/add-ons/kernel/drivers/network/ether/sis900/dev/sis/if_sisreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/sis900/dev/sis/if_sisreg.h rename to src/add-ons/kernel/drivers/network/ether/sis900/dev/sis/if_sisreg.h diff --git a/src/add-ons/kernel/drivers/network/sis900/glue.c b/src/add-ons/kernel/drivers/network/ether/sis900/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/sis900/glue.c rename to src/add-ons/kernel/drivers/network/ether/sis900/glue.c diff --git a/src/add-ons/kernel/drivers/network/syskonnect/Jamfile b/src/add-ons/kernel/drivers/network/ether/syskonnect/Jamfile similarity index 90% rename from src/add-ons/kernel/drivers/network/syskonnect/Jamfile rename to src/add-ons/kernel/drivers/network/ether/syskonnect/Jamfile index c52db1ac6e..608e271d09 100644 --- a/src/add-ons/kernel/drivers/network/syskonnect/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/syskonnect/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network syskonnect ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether syskonnect ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/brgphyreg.h b/src/add-ons/kernel/drivers/network/ether/syskonnect/dev/mii/brgphyreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/syskonnect/dev/mii/brgphyreg.h rename to src/add-ons/kernel/drivers/network/ether/syskonnect/dev/mii/brgphyreg.h diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/e1000phy.c b/src/add-ons/kernel/drivers/network/ether/syskonnect/dev/mii/e1000phy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/syskonnect/dev/mii/e1000phy.c rename to src/add-ons/kernel/drivers/network/ether/syskonnect/dev/mii/e1000phy.c diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/e1000phyreg.h b/src/add-ons/kernel/drivers/network/ether/syskonnect/dev/mii/e1000phyreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/syskonnect/dev/mii/e1000phyreg.h rename to src/add-ons/kernel/drivers/network/ether/syskonnect/dev/mii/e1000phyreg.h diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/ukphy.c b/src/add-ons/kernel/drivers/network/ether/syskonnect/dev/mii/ukphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/syskonnect/dev/mii/ukphy.c rename to src/add-ons/kernel/drivers/network/ether/syskonnect/dev/mii/ukphy.c diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/ukphy_subr.c b/src/add-ons/kernel/drivers/network/ether/syskonnect/dev/mii/ukphy_subr.c similarity index 100% rename from src/add-ons/kernel/drivers/network/syskonnect/dev/mii/ukphy_subr.c rename to src/add-ons/kernel/drivers/network/ether/syskonnect/dev/mii/ukphy_subr.c diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/xmphy.c b/src/add-ons/kernel/drivers/network/ether/syskonnect/dev/mii/xmphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/syskonnect/dev/mii/xmphy.c rename to src/add-ons/kernel/drivers/network/ether/syskonnect/dev/mii/xmphy.c diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/xmphyreg.h b/src/add-ons/kernel/drivers/network/ether/syskonnect/dev/mii/xmphyreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/syskonnect/dev/mii/xmphyreg.h rename to src/add-ons/kernel/drivers/network/ether/syskonnect/dev/mii/xmphyreg.h diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/if_sk.c b/src/add-ons/kernel/drivers/network/ether/syskonnect/dev/sk/if_sk.c similarity index 100% rename from src/add-ons/kernel/drivers/network/syskonnect/dev/sk/if_sk.c rename to src/add-ons/kernel/drivers/network/ether/syskonnect/dev/sk/if_sk.c diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/if_skreg.h b/src/add-ons/kernel/drivers/network/ether/syskonnect/dev/sk/if_skreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/syskonnect/dev/sk/if_skreg.h rename to src/add-ons/kernel/drivers/network/ether/syskonnect/dev/sk/if_skreg.h diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/xmaciireg.h b/src/add-ons/kernel/drivers/network/ether/syskonnect/dev/sk/xmaciireg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/syskonnect/dev/sk/xmaciireg.h rename to src/add-ons/kernel/drivers/network/ether/syskonnect/dev/sk/xmaciireg.h diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/yukonreg.h b/src/add-ons/kernel/drivers/network/ether/syskonnect/dev/sk/yukonreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/syskonnect/dev/sk/yukonreg.h rename to src/add-ons/kernel/drivers/network/ether/syskonnect/dev/sk/yukonreg.h diff --git a/src/add-ons/kernel/drivers/network/syskonnect/glue.c b/src/add-ons/kernel/drivers/network/ether/syskonnect/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/syskonnect/glue.c rename to src/add-ons/kernel/drivers/network/ether/syskonnect/glue.c diff --git a/src/add-ons/kernel/drivers/network/usb_asix/ASIXDevice.cpp b/src/add-ons/kernel/drivers/network/ether/usb_asix/ASIXDevice.cpp similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_asix/ASIXDevice.cpp rename to src/add-ons/kernel/drivers/network/ether/usb_asix/ASIXDevice.cpp diff --git a/src/add-ons/kernel/drivers/network/usb_asix/ASIXDevice.h b/src/add-ons/kernel/drivers/network/ether/usb_asix/ASIXDevice.h similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_asix/ASIXDevice.h rename to src/add-ons/kernel/drivers/network/ether/usb_asix/ASIXDevice.h diff --git a/src/add-ons/kernel/drivers/network/usb_asix/ASIXVendorRequests.h b/src/add-ons/kernel/drivers/network/ether/usb_asix/ASIXVendorRequests.h similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_asix/ASIXVendorRequests.h rename to src/add-ons/kernel/drivers/network/ether/usb_asix/ASIXVendorRequests.h diff --git a/src/add-ons/kernel/drivers/network/usb_asix/AX88172Device.cpp b/src/add-ons/kernel/drivers/network/ether/usb_asix/AX88172Device.cpp similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_asix/AX88172Device.cpp rename to src/add-ons/kernel/drivers/network/ether/usb_asix/AX88172Device.cpp diff --git a/src/add-ons/kernel/drivers/network/usb_asix/AX88172Device.h b/src/add-ons/kernel/drivers/network/ether/usb_asix/AX88172Device.h similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_asix/AX88172Device.h rename to src/add-ons/kernel/drivers/network/ether/usb_asix/AX88172Device.h diff --git a/src/add-ons/kernel/drivers/network/usb_asix/AX88178Device.cpp b/src/add-ons/kernel/drivers/network/ether/usb_asix/AX88178Device.cpp similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_asix/AX88178Device.cpp rename to src/add-ons/kernel/drivers/network/ether/usb_asix/AX88178Device.cpp diff --git a/src/add-ons/kernel/drivers/network/usb_asix/AX88178Device.h b/src/add-ons/kernel/drivers/network/ether/usb_asix/AX88178Device.h similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_asix/AX88178Device.h rename to src/add-ons/kernel/drivers/network/ether/usb_asix/AX88178Device.h diff --git a/src/add-ons/kernel/drivers/network/usb_asix/AX88772Device.cpp b/src/add-ons/kernel/drivers/network/ether/usb_asix/AX88772Device.cpp similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_asix/AX88772Device.cpp rename to src/add-ons/kernel/drivers/network/ether/usb_asix/AX88772Device.cpp diff --git a/src/add-ons/kernel/drivers/network/usb_asix/AX88772Device.h b/src/add-ons/kernel/drivers/network/ether/usb_asix/AX88772Device.h similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_asix/AX88772Device.h rename to src/add-ons/kernel/drivers/network/ether/usb_asix/AX88772Device.h diff --git a/src/add-ons/kernel/drivers/network/usb_asix/Driver.cpp b/src/add-ons/kernel/drivers/network/ether/usb_asix/Driver.cpp similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_asix/Driver.cpp rename to src/add-ons/kernel/drivers/network/ether/usb_asix/Driver.cpp diff --git a/src/add-ons/kernel/drivers/network/usb_asix/Driver.h b/src/add-ons/kernel/drivers/network/ether/usb_asix/Driver.h similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_asix/Driver.h rename to src/add-ons/kernel/drivers/network/ether/usb_asix/Driver.h diff --git a/src/add-ons/kernel/drivers/network/usb_asix/Jamfile b/src/add-ons/kernel/drivers/network/ether/usb_asix/Jamfile similarity index 73% rename from src/add-ons/kernel/drivers/network/usb_asix/Jamfile rename to src/add-ons/kernel/drivers/network/ether/usb_asix/Jamfile index 2cb132dfbb..e282e297bd 100644 --- a/src/add-ons/kernel/drivers/network/usb_asix/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/usb_asix/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network usb_asix ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether usb_asix ; UsePrivateHeaders kernel net ; UsePrivateKernelHeaders ; diff --git a/src/add-ons/kernel/drivers/network/usb_asix/MIIBus.cpp b/src/add-ons/kernel/drivers/network/ether/usb_asix/MIIBus.cpp similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_asix/MIIBus.cpp rename to src/add-ons/kernel/drivers/network/ether/usb_asix/MIIBus.cpp diff --git a/src/add-ons/kernel/drivers/network/usb_asix/MIIBus.h b/src/add-ons/kernel/drivers/network/ether/usb_asix/MIIBus.h similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_asix/MIIBus.h rename to src/add-ons/kernel/drivers/network/ether/usb_asix/MIIBus.h diff --git a/src/add-ons/kernel/drivers/network/usb_asix/Settings.cpp b/src/add-ons/kernel/drivers/network/ether/usb_asix/Settings.cpp similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_asix/Settings.cpp rename to src/add-ons/kernel/drivers/network/ether/usb_asix/Settings.cpp diff --git a/src/add-ons/kernel/drivers/network/usb_asix/Settings.h b/src/add-ons/kernel/drivers/network/ether/usb_asix/Settings.h similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_asix/Settings.h rename to src/add-ons/kernel/drivers/network/ether/usb_asix/Settings.h diff --git a/src/add-ons/kernel/drivers/network/usb_asix/usb_asix.settings b/src/add-ons/kernel/drivers/network/ether/usb_asix/usb_asix.settings similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_asix/usb_asix.settings rename to src/add-ons/kernel/drivers/network/ether/usb_asix/usb_asix.settings diff --git a/src/add-ons/kernel/drivers/network/usb_davicom/DavicomDevice.cpp b/src/add-ons/kernel/drivers/network/ether/usb_davicom/DavicomDevice.cpp similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_davicom/DavicomDevice.cpp rename to src/add-ons/kernel/drivers/network/ether/usb_davicom/DavicomDevice.cpp diff --git a/src/add-ons/kernel/drivers/network/usb_davicom/DavicomDevice.h b/src/add-ons/kernel/drivers/network/ether/usb_davicom/DavicomDevice.h similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_davicom/DavicomDevice.h rename to src/add-ons/kernel/drivers/network/ether/usb_davicom/DavicomDevice.h diff --git a/src/add-ons/kernel/drivers/network/usb_davicom/Driver.cpp b/src/add-ons/kernel/drivers/network/ether/usb_davicom/Driver.cpp similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_davicom/Driver.cpp rename to src/add-ons/kernel/drivers/network/ether/usb_davicom/Driver.cpp diff --git a/src/add-ons/kernel/drivers/network/usb_davicom/Driver.h b/src/add-ons/kernel/drivers/network/ether/usb_davicom/Driver.h similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_davicom/Driver.h rename to src/add-ons/kernel/drivers/network/ether/usb_davicom/Driver.h diff --git a/src/add-ons/kernel/drivers/network/usb_davicom/Jamfile b/src/add-ons/kernel/drivers/network/ether/usb_davicom/Jamfile similarity index 64% rename from src/add-ons/kernel/drivers/network/usb_davicom/Jamfile rename to src/add-ons/kernel/drivers/network/ether/usb_davicom/Jamfile index 16bde7915a..f9d9feb88a 100644 --- a/src/add-ons/kernel/drivers/network/usb_davicom/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/usb_davicom/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network usb_davicom ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether usb_davicom ; UsePrivateHeaders kernel net ; UsePrivateKernelHeaders ; diff --git a/src/add-ons/kernel/drivers/network/usb_davicom/Settings.cpp b/src/add-ons/kernel/drivers/network/ether/usb_davicom/Settings.cpp similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_davicom/Settings.cpp rename to src/add-ons/kernel/drivers/network/ether/usb_davicom/Settings.cpp diff --git a/src/add-ons/kernel/drivers/network/usb_davicom/Settings.h b/src/add-ons/kernel/drivers/network/ether/usb_davicom/Settings.h similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_davicom/Settings.h rename to src/add-ons/kernel/drivers/network/ether/usb_davicom/Settings.h diff --git a/src/add-ons/kernel/drivers/network/usb_davicom/usb_davicom.settings b/src/add-ons/kernel/drivers/network/ether/usb_davicom/usb_davicom.settings similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_davicom/usb_davicom.settings rename to src/add-ons/kernel/drivers/network/ether/usb_davicom/usb_davicom.settings diff --git a/src/add-ons/kernel/drivers/network/usb_ecm/Driver.cpp b/src/add-ons/kernel/drivers/network/ether/usb_ecm/Driver.cpp similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_ecm/Driver.cpp rename to src/add-ons/kernel/drivers/network/ether/usb_ecm/Driver.cpp diff --git a/src/add-ons/kernel/drivers/network/usb_ecm/Driver.h b/src/add-ons/kernel/drivers/network/ether/usb_ecm/Driver.h similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_ecm/Driver.h rename to src/add-ons/kernel/drivers/network/ether/usb_ecm/Driver.h diff --git a/src/add-ons/kernel/drivers/network/usb_ecm/ECMDevice.cpp b/src/add-ons/kernel/drivers/network/ether/usb_ecm/ECMDevice.cpp similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_ecm/ECMDevice.cpp rename to src/add-ons/kernel/drivers/network/ether/usb_ecm/ECMDevice.cpp diff --git a/src/add-ons/kernel/drivers/network/usb_ecm/ECMDevice.h b/src/add-ons/kernel/drivers/network/ether/usb_ecm/ECMDevice.h similarity index 100% rename from src/add-ons/kernel/drivers/network/usb_ecm/ECMDevice.h rename to src/add-ons/kernel/drivers/network/ether/usb_ecm/ECMDevice.h diff --git a/src/add-ons/kernel/drivers/network/usb_ecm/Jamfile b/src/add-ons/kernel/drivers/network/ether/usb_ecm/Jamfile similarity index 60% rename from src/add-ons/kernel/drivers/network/usb_ecm/Jamfile rename to src/add-ons/kernel/drivers/network/ether/usb_ecm/Jamfile index a842441e34..a6249429f3 100644 --- a/src/add-ons/kernel/drivers/network/usb_ecm/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/usb_ecm/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network usb_ecm ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether usb_ecm ; UsePrivateKernelHeaders ; UsePrivateHeaders net ; diff --git a/src/add-ons/kernel/drivers/network/via_rhine/Jamfile b/src/add-ons/kernel/drivers/network/ether/via_rhine/Jamfile similarity index 90% rename from src/add-ons/kernel/drivers/network/via_rhine/Jamfile rename to src/add-ons/kernel/drivers/network/ether/via_rhine/Jamfile index 707ec2f986..59150246c2 100644 --- a/src/add-ons/kernel/drivers/network/via_rhine/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/via_rhine/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network via_rhine ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether via_rhine ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; diff --git a/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ciphy.c b/src/add-ons/kernel/drivers/network/ether/via_rhine/dev/mii/ciphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ciphy.c rename to src/add-ons/kernel/drivers/network/ether/via_rhine/dev/mii/ciphy.c diff --git a/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ciphyreg.h b/src/add-ons/kernel/drivers/network/ether/via_rhine/dev/mii/ciphyreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ciphyreg.h rename to src/add-ons/kernel/drivers/network/ether/via_rhine/dev/mii/ciphyreg.h diff --git a/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ukphy.c b/src/add-ons/kernel/drivers/network/ether/via_rhine/dev/mii/ukphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ukphy.c rename to src/add-ons/kernel/drivers/network/ether/via_rhine/dev/mii/ukphy.c diff --git a/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ukphy_subr.c b/src/add-ons/kernel/drivers/network/ether/via_rhine/dev/mii/ukphy_subr.c similarity index 100% rename from src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ukphy_subr.c rename to src/add-ons/kernel/drivers/network/ether/via_rhine/dev/mii/ukphy_subr.c diff --git a/src/add-ons/kernel/drivers/network/via_rhine/dev/vr/if_vr.c b/src/add-ons/kernel/drivers/network/ether/via_rhine/dev/vr/if_vr.c similarity index 100% rename from src/add-ons/kernel/drivers/network/via_rhine/dev/vr/if_vr.c rename to src/add-ons/kernel/drivers/network/ether/via_rhine/dev/vr/if_vr.c diff --git a/src/add-ons/kernel/drivers/network/via_rhine/dev/vr/if_vrreg.h b/src/add-ons/kernel/drivers/network/ether/via_rhine/dev/vr/if_vrreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/via_rhine/dev/vr/if_vrreg.h rename to src/add-ons/kernel/drivers/network/ether/via_rhine/dev/vr/if_vrreg.h diff --git a/src/add-ons/kernel/drivers/network/via_rhine/glue.c b/src/add-ons/kernel/drivers/network/ether/via_rhine/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/via_rhine/glue.c rename to src/add-ons/kernel/drivers/network/ether/via_rhine/glue.c diff --git a/src/add-ons/kernel/drivers/network/virtio/Jamfile b/src/add-ons/kernel/drivers/network/ether/virtio/Jamfile similarity index 62% rename from src/add-ons/kernel/drivers/network/virtio/Jamfile rename to src/add-ons/kernel/drivers/network/ether/virtio/Jamfile index f8131115f2..dd4026da48 100644 --- a/src/add-ons/kernel/drivers/network/virtio/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/virtio/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network virtio ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether virtio ; UsePrivateKernelHeaders ; UsePrivateHeaders drivers net virtio ; diff --git a/src/add-ons/kernel/drivers/network/virtio/virtio_net.cpp b/src/add-ons/kernel/drivers/network/ether/virtio/virtio_net.cpp similarity index 100% rename from src/add-ons/kernel/drivers/network/virtio/virtio_net.cpp rename to src/add-ons/kernel/drivers/network/ether/virtio/virtio_net.cpp diff --git a/src/add-ons/kernel/drivers/network/virtio/virtio_net.h b/src/add-ons/kernel/drivers/network/ether/virtio/virtio_net.h similarity index 100% rename from src/add-ons/kernel/drivers/network/virtio/virtio_net.h rename to src/add-ons/kernel/drivers/network/ether/virtio/virtio_net.h diff --git a/src/add-ons/kernel/drivers/network/vt612x/Jamfile b/src/add-ons/kernel/drivers/network/ether/vt612x/Jamfile similarity index 90% rename from src/add-ons/kernel/drivers/network/vt612x/Jamfile rename to src/add-ons/kernel/drivers/network/ether/vt612x/Jamfile index eae6354b66..d4c382c5fb 100644 --- a/src/add-ons/kernel/drivers/network/vt612x/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/vt612x/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network vt612x ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether vt612x ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; diff --git a/src/add-ons/kernel/drivers/network/vt612x/dev/mii/ciphy.c b/src/add-ons/kernel/drivers/network/ether/vt612x/dev/mii/ciphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/vt612x/dev/mii/ciphy.c rename to src/add-ons/kernel/drivers/network/ether/vt612x/dev/mii/ciphy.c diff --git a/src/add-ons/kernel/drivers/network/vt612x/dev/mii/ciphyreg.h b/src/add-ons/kernel/drivers/network/ether/vt612x/dev/mii/ciphyreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/vt612x/dev/mii/ciphyreg.h rename to src/add-ons/kernel/drivers/network/ether/vt612x/dev/mii/ciphyreg.h diff --git a/src/add-ons/kernel/drivers/network/vt612x/dev/mii/ukphy.c b/src/add-ons/kernel/drivers/network/ether/vt612x/dev/mii/ukphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/vt612x/dev/mii/ukphy.c rename to src/add-ons/kernel/drivers/network/ether/vt612x/dev/mii/ukphy.c diff --git a/src/add-ons/kernel/drivers/network/vt612x/dev/mii/ukphy_subr.c b/src/add-ons/kernel/drivers/network/ether/vt612x/dev/mii/ukphy_subr.c similarity index 100% rename from src/add-ons/kernel/drivers/network/vt612x/dev/mii/ukphy_subr.c rename to src/add-ons/kernel/drivers/network/ether/vt612x/dev/mii/ukphy_subr.c diff --git a/src/add-ons/kernel/drivers/network/vt612x/dev/vge/if_vge.c b/src/add-ons/kernel/drivers/network/ether/vt612x/dev/vge/if_vge.c similarity index 100% rename from src/add-ons/kernel/drivers/network/vt612x/dev/vge/if_vge.c rename to src/add-ons/kernel/drivers/network/ether/vt612x/dev/vge/if_vge.c diff --git a/src/add-ons/kernel/drivers/network/vt612x/dev/vge/if_vgereg.h b/src/add-ons/kernel/drivers/network/ether/vt612x/dev/vge/if_vgereg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/vt612x/dev/vge/if_vgereg.h rename to src/add-ons/kernel/drivers/network/ether/vt612x/dev/vge/if_vgereg.h diff --git a/src/add-ons/kernel/drivers/network/vt612x/dev/vge/if_vgevar.h b/src/add-ons/kernel/drivers/network/ether/vt612x/dev/vge/if_vgevar.h similarity index 100% rename from src/add-ons/kernel/drivers/network/vt612x/dev/vge/if_vgevar.h rename to src/add-ons/kernel/drivers/network/ether/vt612x/dev/vge/if_vgevar.h diff --git a/src/add-ons/kernel/drivers/network/vt612x/glue.c b/src/add-ons/kernel/drivers/network/ether/vt612x/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/vt612x/glue.c rename to src/add-ons/kernel/drivers/network/ether/vt612x/glue.c diff --git a/src/add-ons/kernel/drivers/network/wb840/Jamfile b/src/add-ons/kernel/drivers/network/ether/wb840/Jamfile similarity index 74% rename from src/add-ons/kernel/drivers/network/wb840/Jamfile rename to src/add-ons/kernel/drivers/network/ether/wb840/Jamfile index 278a73b91a..e7afde96e8 100644 --- a/src/add-ons/kernel/drivers/network/wb840/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/wb840/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network wb840 ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether wb840 ; # set some additional flags # For ether_driver.h @@ -26,12 +26,12 @@ actions ignore Installwb840 # Installation -HaikuInstall install-networking : /boot/home/config/add-ons/kernel/drivers/bin : - wb840 +HaikuInstall install-networking : /boot/home/config/add-ons/kernel/drivers/bin : + wb840 ; -HaikuInstallRelSymLink install-networking : /boot/home/config/add-ons/kernel/drivers/dev/net : - wb840 : - installed-symlink +HaikuInstallRelSymLink install-networking : /boot/home/config/add-ons/kernel/drivers/dev/net : + wb840 : + installed-symlink ; diff --git a/src/add-ons/kernel/drivers/network/wb840/debug.h b/src/add-ons/kernel/drivers/network/ether/wb840/debug.h similarity index 100% rename from src/add-ons/kernel/drivers/network/wb840/debug.h rename to src/add-ons/kernel/drivers/network/ether/wb840/debug.h diff --git a/src/add-ons/kernel/drivers/network/wb840/device.c b/src/add-ons/kernel/drivers/network/ether/wb840/device.c similarity index 100% rename from src/add-ons/kernel/drivers/network/wb840/device.c rename to src/add-ons/kernel/drivers/network/ether/wb840/device.c diff --git a/src/add-ons/kernel/drivers/network/wb840/device.h b/src/add-ons/kernel/drivers/network/ether/wb840/device.h similarity index 100% rename from src/add-ons/kernel/drivers/network/wb840/device.h rename to src/add-ons/kernel/drivers/network/ether/wb840/device.h diff --git a/src/add-ons/kernel/drivers/network/wb840/driver.c b/src/add-ons/kernel/drivers/network/ether/wb840/driver.c similarity index 100% rename from src/add-ons/kernel/drivers/network/wb840/driver.c rename to src/add-ons/kernel/drivers/network/ether/wb840/driver.c diff --git a/src/add-ons/kernel/drivers/network/wb840/driver.h b/src/add-ons/kernel/drivers/network/ether/wb840/driver.h similarity index 100% rename from src/add-ons/kernel/drivers/network/wb840/driver.h rename to src/add-ons/kernel/drivers/network/ether/wb840/driver.h diff --git a/src/add-ons/kernel/drivers/network/wb840/interface.c b/src/add-ons/kernel/drivers/network/ether/wb840/interface.c similarity index 100% rename from src/add-ons/kernel/drivers/network/wb840/interface.c rename to src/add-ons/kernel/drivers/network/ether/wb840/interface.c diff --git a/src/add-ons/kernel/drivers/network/wb840/interface.h b/src/add-ons/kernel/drivers/network/ether/wb840/interface.h similarity index 100% rename from src/add-ons/kernel/drivers/network/wb840/interface.h rename to src/add-ons/kernel/drivers/network/ether/wb840/interface.h diff --git a/src/add-ons/kernel/drivers/network/wb840/wb840.c b/src/add-ons/kernel/drivers/network/ether/wb840/wb840.c similarity index 100% rename from src/add-ons/kernel/drivers/network/wb840/wb840.c rename to src/add-ons/kernel/drivers/network/ether/wb840/wb840.c diff --git a/src/add-ons/kernel/drivers/network/wb840/wb840.h b/src/add-ons/kernel/drivers/network/ether/wb840/wb840.h similarity index 100% rename from src/add-ons/kernel/drivers/network/wb840/wb840.h rename to src/add-ons/kernel/drivers/network/ether/wb840/wb840.h