From e5649383245d06750d9d6081e7675aabab1477b5 Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Wed, 29 Oct 2025 13:03:47 +0100
Subject: [PATCH] iface: remove always-Ok Results in consume().

They're useless, Ok() was always returned. Additionally, it's misleading
to return a Result from the `consume` closure since it implies TX will
be canceled on Err which is not the case (the driver implementation can't inspect the
result, it just sees a generic `R`, all it can do is pass it through).
---
 src/iface/interface/ethernet.rs |  4 ++--
 src/iface/interface/mod.rs      | 21 ++++++++++-----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/iface/interface/ethernet.rs b/src/iface/interface/ethernet.rs
index da2d01229..19d203b4b 100644
--- a/src/iface/interface/ethernet.rs
+++ b/src/iface/interface/ethernet.rs
@@ -64,8 +64,8 @@ impl InterfaceInner {
             frame.set_src_addr(src_addr);
 
             f(frame);
+        });
 
-            Ok(())
-        })
+        Ok(())
     }
 }
diff --git a/src/iface/interface/mod.rs b/src/iface/interface/mod.rs
index d10d053ff..28a0ba560 100644
--- a/src/iface/interface/mod.rs
+++ b/src/iface/interface/mod.rs
@@ -1199,8 +1199,6 @@ impl InterfaceInner {
                 #[cfg(feature = "proto-ipv6")]
                 IpVersion::Ipv6 => frame.set_ethertype(EthernetProtocol::Ipv6),
             }
-
-            Ok(())
         };
 
         // Emit function for the IP header and payload.
@@ -1272,7 +1270,7 @@ impl InterfaceInner {
                         tx_token.consume(tx_len, |mut tx_buffer| {
                             #[cfg(feature = "medium-ethernet")]
                             if matches!(self.caps.medium, Medium::Ethernet) {
-                                emit_ethernet(&ip_repr, tx_buffer)?;
+                                emit_ethernet(&ip_repr, tx_buffer);
                                 tx_buffer = &mut tx_buffer[EthernetFrame::<&[u8]>::header_len()..];
                             }
 
@@ -1282,9 +1280,9 @@ impl InterfaceInner {
                             // Copy the IP header and the payload.
                             tx_buffer[..first_frag_ip_len]
                                 .copy_from_slice(&frag.buffer[..first_frag_ip_len]);
+                        });
 
-                            Ok(())
-                        })
+                        Ok(())
                     }
 
                     #[cfg(not(feature = "proto-ipv4-fragmentation"))]
@@ -1301,13 +1299,14 @@ impl InterfaceInner {
                     tx_token.consume(total_len, |mut tx_buffer| {
                         #[cfg(feature = "medium-ethernet")]
                         if matches!(self.caps.medium, Medium::Ethernet) {
-                            emit_ethernet(&ip_repr, tx_buffer)?;
+                            emit_ethernet(&ip_repr, tx_buffer);
                             tx_buffer = &mut tx_buffer[EthernetFrame::<&[u8]>::header_len()..];
                         }
 
                         emit_ip(&ip_repr, tx_buffer);
-                        Ok(())
-                    })
+                    });
+
+                    Ok(())
                 }
             }
             // We don't support IPv6 fragmentation yet.
@@ -1321,13 +1320,13 @@ impl InterfaceInner {
                     tx_token.consume(total_len, |mut tx_buffer| {
                         #[cfg(feature = "medium-ethernet")]
                         if matches!(self.caps.medium, Medium::Ethernet) {
-                            emit_ethernet(&ip_repr, tx_buffer)?;
+                            emit_ethernet(&ip_repr, tx_buffer);
                             tx_buffer = &mut tx_buffer[EthernetFrame::<&[u8]>::header_len()..];
                         }
 
                         emit_ip(&ip_repr, tx_buffer);
-                        Ok(())
-                    })
+                    });
+                    Ok(())
                 }
             }
         }