net: Make MTU consistent with packet_len

fwsGonzo · fwsGonzo · commit 75837f09fe1c · 2017-05-23T15:12:50.000+02:00
diff --git a/src/drivers/virtionet.hpp b/src/drivers/virtionet.hpp
@@ -133,7 +133,7 @@ class VirtioNet : Virtio, public net::Link_layer<net::Ethernet> {
   { return 1500; }
 
   uint16_t packet_len() const noexcept {
-    return Link::Protocol::header_size() + MTU();
+    return sizeof(net::ethernet::Header) + MTU();
   }
 
   net::Packet_ptr create_packet(int) override;
diff --git a/src/drivers/vmxnet3.hpp b/src/drivers/vmxnet3.hpp
@@ -52,8 +52,8 @@ class vmxnet3 : public net::Link_layer<net::Ethernet>
   }
 
   uint16_t packet_len() const noexcept
-  {        // ethernet + vlan + fcs
-    return ETH_FRAME_LEN + 4 + 4;
+  {
+    return sizeof(net::ethernet::Header) + MTU();
   }
 
   net::downstream create_physical_downstream()

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ class VirtioNet : Virtio, public net::Link_layer<net::Ethernet> {`
`133`	`133`	`{ return 1500; }`
`134`	`134`
`135`	`135`	`uint16_t packet_len() const noexcept {`
`136`		`- return Link::Protocol::header_size() + MTU();`
	`136`	`+ return sizeof(net::ethernet::Header) + MTU();`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`net::Packet_ptr create_packet(int) override;`
Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,8 @@ class vmxnet3 : public net::Link_layer<net::Ethernet>`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`uint16_t packet_len() const noexcept`
`55`		`- { // ethernet + vlan + fcs`
`56`		`- return ETH_FRAME_LEN + 4 + 4;`
	`55`	`+ {`
	`56`	`+ return sizeof(net::ethernet::Header) + MTU();`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`net::downstream create_physical_downstream()`