diff --git a/net_util/src/lib.rs b/net_util/src/lib.rs index c8fd8f7fa..3859649f2 100644 --- a/net_util/src/lib.rs +++ b/net_util/src/lib.rs @@ -70,6 +70,11 @@ fn create_socket() -> Result { Ok(unsafe { net::UdpSocket::from_raw_fd(sock) }) } +fn vnet_hdr_len() -> usize { + use virtio_bindings::bindings::virtio_net::virtio_net_hdr_v1; + std::mem::size_of::() +} + #[cfg(test)] mod tests { use super::*; diff --git a/net_util/src/open_tap.rs b/net_util/src/open_tap.rs index 859979515..4ff4d17c7 100644 --- a/net_util/src/open_tap.rs +++ b/net_util/src/open_tap.rs @@ -2,12 +2,10 @@ // // SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause -use super::TapError; -use super::{MacAddr, Tap}; +use super::{vnet_hdr_len, MacAddr, Tap, TapError}; use std::net::Ipv4Addr; use std::path::Path; use std::{fs, io}; -use virtio_bindings::bindings::virtio_net::virtio_net_hdr_v1; #[derive(Debug)] pub enum Error { @@ -39,10 +37,6 @@ pub enum Error { type Result = std::result::Result; -fn vnet_hdr_len() -> usize { - std::mem::size_of::() -} - fn check_mq_support(if_name: &Option<&str>, queue_pairs: usize) -> Result<()> { if let Some(tap_name) = if_name { let mq = queue_pairs > 1; diff --git a/net_util/src/queue_pair.rs b/net_util/src/queue_pair.rs index 44fe157cb..42c883f30 100644 --- a/net_util/src/queue_pair.rs +++ b/net_util/src/queue_pair.rs @@ -2,13 +2,12 @@ // // SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause -use super::Tap; +use super::{vnet_hdr_len, Tap}; use std::cmp; use std::io::Write; use std::num::Wrapping; use vm_memory::{Bytes, GuestAddress, GuestMemoryMmap}; use vm_virtio::{DescriptorChain, Queue}; -use virtio_bindings::bindings::virtio_net::virtio_net_hdr_v1 /// The maximum buffer size when segmentation offload is enabled. This /// includes the 12-byte virtio net header. @@ -183,7 +182,3 @@ impl RxVirtio { } } } - -fn vnet_hdr_len() -> usize { - std::mem::size_of::() -}