diff --git a/examples/aarch64/src/main.rs b/examples/aarch64/src/main.rs index 7c0ca64a..9b9a98c0 100644 --- a/examples/aarch64/src/main.rs +++ b/examples/aarch64/src/main.rs @@ -203,7 +203,7 @@ fn virtio_net(transport: T) { pkt_len, &buf[hdr_len..hdr_len + pkt_len] ); - net.transmit_wait(&buf[..hdr_len + pkt_len]) + net.send(&buf[..hdr_len + pkt_len]) .expect("failed to send"); info!("virtio-net test finished"); } diff --git a/examples/riscv/src/main.rs b/examples/riscv/src/main.rs index 8e66ea2f..2e85dcde 100644 --- a/examples/riscv/src/main.rs +++ b/examples/riscv/src/main.rs @@ -159,7 +159,7 @@ fn virtio_net(transport: T) { pkt_len, &buf[hdr_len..hdr_len + pkt_len] ); - net.transmit_wait(&buf[..hdr_len + pkt_len]) + net.send(&buf[..hdr_len + pkt_len]) .expect("failed to send"); info!("virtio-net test finished"); } diff --git a/examples/riscv/src/tcp.rs b/examples/riscv/src/tcp.rs index 69c6e2b8..5f6623c3 100644 --- a/examples/riscv/src/tcp.rs +++ b/examples/riscv/src/tcp.rs @@ -93,7 +93,7 @@ impl TxToken for VirtioTxToken { let mut tx_buf = dev.new_tx_buffer(len); let result = f(tx_buf.packet_mut()); trace!("SEND {} bytes: {:02X?}", len, tx_buf.packet()); - dev.transmit_wait(tx_buf).unwrap(); + dev.send(tx_buf).unwrap(); result } } diff --git a/examples/x86_64/src/main.rs b/examples/x86_64/src/main.rs index 5c79b20f..b307c133 100644 --- a/examples/x86_64/src/main.rs +++ b/examples/x86_64/src/main.rs @@ -130,7 +130,7 @@ fn virtio_net(transport: T) { pkt_len, &buf[hdr_len..hdr_len + pkt_len] ); - net.transmit_wait(&buf[..hdr_len + pkt_len]) + net.send(&buf[..hdr_len + pkt_len]) .expect("failed to send"); info!("virtio-net test finished"); } diff --git a/src/device/net/dev.rs b/src/device/net/dev.rs index d3c3119d..5dfba600 100644 --- a/src/device/net/dev.rs +++ b/src/device/net/dev.rs @@ -117,12 +117,6 @@ impl VirtIONet TxBuffer(vec![0; buf_len]) } - /// Sends a [`TxBuffer`] to the network, and blocks until the request - /// completed. Returns number of bytes transmitted. - pub fn transmit_wait(&mut self, tx_buf: TxBuffer) -> Result { - self.inner.transmit_wait(tx_buf.packet()) - } - /// Sends a [`TxBuffer`] to the network, and blocks until the request /// completed. pub fn send(&mut self, tx_buf: TxBuffer) -> Result { diff --git a/src/device/net/dev_raw.rs b/src/device/net/dev_raw.rs index 39a84529..20b47d17 100644 --- a/src/device/net/dev_raw.rs +++ b/src/device/net/dev_raw.rs @@ -241,21 +241,6 @@ impl VirtIONetRaw Result { - let token = unsafe { self.transmit_begin(tx_buf)? }; - while self.poll_transmit().is_none() { - core::hint::spin_loop(); - } - unsafe { self.transmit_complete(token, tx_buf) } - } - /// Sends a packet to the network, and blocks until the request /// completed. pub fn send(&mut self, tx_buf: &[u8]) -> Result {