diff --git a/src/add-ons/kernel/drivers/network/Jamfile b/src/add-ons/kernel/drivers/network/Jamfile index 55ad32aa31..931884cb91 100644 --- a/src/add-ons/kernel/drivers/network/Jamfile +++ b/src/add-ons/kernel/drivers/network/Jamfile @@ -21,7 +21,7 @@ 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 syskonnect ; SubInclude HAIKU_TOP src add-ons kernel drivers network attansic_l2 ; -SubInclude HAIKU_TOP src add-ons kernel drivers network re ; +SubInclude HAIKU_TOP src add-ons kernel drivers network rtl81xx ; SubIncludeGPL HAIKU_TOP src add-ons kernel drivers network bcm440x ; SubIncludeGPL HAIKU_TOP src add-ons kernel drivers network bcm570x ; diff --git a/src/add-ons/kernel/drivers/network/re/Jamfile b/src/add-ons/kernel/drivers/network/re/Jamfile deleted file mode 100644 index 9024558667..0000000000 --- a/src/add-ons/kernel/drivers/network/re/Jamfile +++ /dev/null @@ -1,3 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network re ; - -SubInclude HAIKU_TOP src add-ons kernel drivers network re pci ; diff --git a/src/add-ons/kernel/drivers/network/rtl81xx/Jamfile b/src/add-ons/kernel/drivers/network/rtl81xx/Jamfile new file mode 100644 index 0000000000..b73e8d4cd9 --- /dev/null +++ b/src/add-ons/kernel/drivers/network/rtl81xx/Jamfile @@ -0,0 +1,3 @@ +SubDir HAIKU_TOP src add-ons kernel drivers network rtl81xx ; + +SubInclude HAIKU_TOP src add-ons kernel drivers network rtl81xx pci ; diff --git a/src/add-ons/kernel/drivers/network/re/pci/Jamfile b/src/add-ons/kernel/drivers/network/rtl81xx/pci/Jamfile similarity index 80% rename from src/add-ons/kernel/drivers/network/re/pci/Jamfile rename to src/add-ons/kernel/drivers/network/rtl81xx/pci/Jamfile index 23e6656d4e..c7cc08f98c 100644 --- a/src/add-ons/kernel/drivers/network/re/pci/Jamfile +++ b/src/add-ons/kernel/drivers/network/rtl81xx/pci/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network re pci ; +SubDir HAIKU_TOP src add-ons kernel drivers network rtl81xx pci ; UsePrivateHeaders kernel net ; @@ -8,7 +8,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel drivers network rtl8139 ] SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; -KernelAddon re : +KernelAddon rtl81xx : if_re.c glue.c : libfreebsd_network.a rtl8139_mii.a diff --git a/src/add-ons/kernel/drivers/network/re/pci/glue.c b/src/add-ons/kernel/drivers/network/rtl81xx/pci/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/re/pci/glue.c rename to src/add-ons/kernel/drivers/network/rtl81xx/pci/glue.c diff --git a/src/add-ons/kernel/drivers/network/re/pci/if_re.c b/src/add-ons/kernel/drivers/network/rtl81xx/pci/if_re.c similarity index 99% rename from src/add-ons/kernel/drivers/network/re/pci/if_re.c rename to src/add-ons/kernel/drivers/network/rtl81xx/pci/if_re.c index 5116a1b3d0..13dc33e754 100644 --- a/src/add-ons/kernel/drivers/network/re/pci/if_re.c +++ b/src/add-ons/kernel/drivers/network/rtl81xx/pci/if_re.c @@ -167,17 +167,17 @@ TUNABLE_INT("hw.re.msi_disable", &msi_disable); static struct rl_type re_devs[] = { { DLINK_VENDORID, DLINK_DEVICEID_528T, 0, "D-Link DGE-528(T) Gigabit Ethernet Adapter" }, - { RT_VENDORID, RT_DEVICEID_8139, 0, - "RealTek 8139C+ 10/100BaseTX" }, + /*{ RT_VENDORID, RT_DEVICEID_8139, 0, + "RealTek 8139C+ 10/100BaseTX" },*/ { RT_VENDORID, RT_DEVICEID_8101E, 0, "RealTek 8101E/8102E/8102EL PCIe 10/100baseTX" }, - { RT_VENDORID, RT_DEVICEID_8168, 0, + /*{ RT_VENDORID, RT_DEVICEID_8168, 0, "RealTek 8168/8168B/8168C/8168CP/8111B/8111C/8111CP PCIe " "Gigabit Ethernet" }, { RT_VENDORID, RT_DEVICEID_8169, 0, "RealTek 8169/8169S/8169SB(L)/8110S/8110SB(L) Gigabit Ethernet" }, { RT_VENDORID, RT_DEVICEID_8169SC, 0, - "RealTek 8169SC/8110SC Single-chip Gigabit Ethernet" }, + "RealTek 8169SC/8110SC Single-chip Gigabit Ethernet" },*/ { COREGA_VENDORID, COREGA_DEVICEID_CGLAPCIGT, 0, "Corega CG-LAPCIGT (RTL8169S) Gigabit Ethernet" }, { LINKSYS_VENDORID, LINKSYS_DEVICEID_EG1032, 0, diff --git a/src/add-ons/kernel/drivers/network/re/pci/if_rlreg.h b/src/add-ons/kernel/drivers/network/rtl81xx/pci/if_rlreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/re/pci/if_rlreg.h rename to src/add-ons/kernel/drivers/network/rtl81xx/pci/if_rlreg.h