move MTU check in the hardware independent part

hermit-os · Aug 13, 2023 · a49762d · a49762d
1 parent 7753b5b
commit a49762d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/drivers/net/virtio_mmio.rs b/src/drivers/net/virtio_mmio.rs
@@ -124,8 +124,6 @@ impl VirtioNetDriver {
 
 		let mtu = if let Some(my_mtu) = hermit_var!("HERMIT_MTU") {
 			u16::from_str(&my_mtu).unwrap() + 14
-		} else if dev_cfg.features.is_feature(Features::VIRTIO_NET_F_MTU) {
-			dev_cfg.raw.get_mtu()
 		} else {
 			// fallback to the default MTU
 			1514

diff --git a/src/drivers/net/virtio_net.rs b/src/drivers/net/virtio_net.rs
@@ -929,6 +929,10 @@ impl VirtioNetDriver {
 		// At this point the device is "live"
 		self.com_cfg.drv_ok();
 
+		if self.dev_cfg.features.is_feature(Features::VIRTIO_NET_F_MTU) {
+			self.mtu = self.dev_cfg.raw.get_mtu();
+		}
+
 		Ok(())
 	}
 

diff --git a/src/drivers/net/virtio_pci.rs b/src/drivers/net/virtio_pci.rs
@@ -133,8 +133,6 @@ impl VirtioNetDriver {
 
 		let mtu = if let Some(my_mtu) = hermit_var!("HERMIT_MTU") {
 			u16::from_str(&my_mtu).unwrap() + 14
-		} else if dev_cfg.features.is_feature(Features::VIRTIO_NET_F_MTU) {
-			dev_cfg.raw.get_mtu()
 		} else {
 			// fallback to the default MTU
 			1514