feat: update virtio-drivers version

arceos-org · Nov 16, 2023 · 07b6d52 · 07b6d52
1 parent 7563266
commit 07b6d52
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/driver_pci/Cargo.toml b/crates/driver_pci/Cargo.toml
@@ -10,5 +10,4 @@ repository = "https://github.com/rcore-os/arceos/tree/main/crates/driver_pci"
 documentation = "https://rcore-os.github.io/arceos/driver_pci/index.html"
 
 [dependencies]
-# virtio-drivers = { git = "https://github.com/rcore-os/virtio-drivers.git", rev = "409ee72" }
-virtio-drivers = { git = "https://github.com/hky1999/virtio-drivers.git", rev = "80d1652" }
+virtio-drivers = { git = "https://github.com/rcore-os/virtio-drivers.git", rev = "4b60f5d" }
diff --git a/crates/driver_virtio/Cargo.toml b/crates/driver_virtio/Cargo.toml
@@ -19,5 +19,4 @@ driver_common = { path = "../driver_common" }
 driver_block = { path = "../driver_block", optional = true }
 driver_net = { path = "../driver_net", optional = true }
 driver_display = { path = "../driver_display", optional = true}
-# virtio-drivers = { git = "https://github.com/rcore-os/virtio-drivers.git", rev = "409ee72" }
-virtio-drivers = { git = "https://github.com/hky1999/virtio-drivers.git", rev = "80d1652" }
+virtio-drivers = { git = "https://github.com/rcore-os/virtio-drivers.git", rev = "4b60f5d" }
diff --git a/crates/driver_virtio/src/net.rs b/crates/driver_virtio/src/net.rs
@@ -95,7 +95,7 @@ impl<H: Hal, T: Transport, const QS: usize> NetDriverOps for VirtIoNetDev<H, T,
 
     #[inline]
     fn can_receive(&self) -> bool {
-        self.inner.can_recv()
+        self.inner.poll_receive().is_some()
     }
 
     #[inline]