Merge branch 'driver-category-net' into 'master'

Move all network drivers to net/

See merge request redox-os/drivers!144

Cargo.toml

@@ -3,23 +3,17 @@ members = [
     "ac97d",
     "acpid",
     "ahcid",
-    "alxd",
     "bgad",
     "block-io-wrapper",
     "common",
-    "driver-network",
-    "e1000d",
     "fbcond",
     "ided",
     "ihdad",
-    "ixgbed",
     "nvmed",
     "lived", # TODO: not really a driver...
     "pcid",
     "pcspkrd",
     "ps2d",
-    "rtl8139d",
-    "rtl8168d",
     "sb16d",
     "vboxd",
     "vesad",
@@ -30,10 +24,17 @@ members = [
     "inputd",
 
     "virtio-blkd",
-    "virtio-netd",
     "virtio-gpud",
     "virtio-core",
 
+    "net/alxd",
+    "net/driver-network",
+    "net/e1000d",
+    "net/ixgbed",
+    "net/rtl8139d",
+    "net/rtl8168d",
+    "net/virtio-netd",
+
     "bcm2835-sdhcid",
 ]
 

net/alxd/Cargo.toml

@@ -9,4 +9,4 @@ redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git" }
 redox_syscall = "0.4"
 redox-daemon = "0.1"
 
-common = { path = "../common" }
+common = { path = "../../common" }

net/e1000d/Cargo.toml

@@ -9,6 +9,6 @@ redox-daemon = "0.1"
 redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git" }
 redox_syscall = "0.4"
 
-common = { path = "../common" }
+common = { path = "../../common" }
 driver-network = { path = "../driver-network" }
-pcid = { path = "../pcid" }
+pcid = { path = "../../pcid" }

net/ixgbed/Cargo.toml

@@ -9,6 +9,6 @@ redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git" }
 redox_syscall = "0.4"
 redox-daemon = "0.1"
 
-common = { path = "../common" }
+common = { path = "../../common" }
 driver-network = { path = "../driver-network" }
-pcid = { path = "../pcid" }
+pcid = { path = "../../pcid" }

net/rtl8139d/Cargo.toml

@@ -11,6 +11,6 @@ redox_syscall = "0.4"
 redox-daemon = "0.1"
 redox-log = "0.1"
 
-common = { path = "../common" }
+common = { path = "../../common" }
 driver-network = { path = "../driver-network" }
-pcid = { path = "../pcid" }
+pcid = { path = "../../pcid" }

net/rtl8168d/Cargo.toml

@@ -11,6 +11,6 @@ redox_syscall = "0.4"
 redox-daemon = "0.1"
 redox-log = "0.1"
 
-common = { path = "../common" }
+common = { path = "../../common" }
 driver-network = { path = "../driver-network" }
-pcid = { path = "../pcid" }
+pcid = { path = "../../pcid" }

net/virtio-netd/Cargo.toml

@@ -8,9 +8,9 @@ log = "0.4"
 static_assertions = "1.1.0"
 futures = { version = "0.3.28", features = ["executor"] }
 
-virtio-core = { path = "../virtio-core" }
-pcid = { path = "../pcid" }
-common = { path = "../common" }
+virtio-core = { path = "../../virtio-core" }
+pcid = { path = "../../pcid" }
+common = { path = "../../common" }
 driver-network = { path = "../driver-network" }
 
 redox-daemon = "0.1"