From 853c1737aa7a9230086e465d1a6e4bf4f28daee8 Mon Sep 17 00:00:00 2001
From: Alex Forencich <alex@alexforencich.com>
Date: Fri, 31 Dec 2021 22:57:11 -0800
Subject: [PATCH] Simplify logic

---
 rtl/eth_axis_tx.v | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/rtl/eth_axis_tx.v b/rtl/eth_axis_tx.v
index 55ddca1e..d6dac7e5 100644
--- a/rtl/eth_axis_tx.v
+++ b/rtl/eth_axis_tx.v
@@ -207,14 +207,15 @@ always @* begin
     if (send_eth_payload_reg) begin
         s_eth_payload_axis_tready_next = m_axis_tready_int_early && shift_eth_payload_axis_input_tready;
 
+        m_axis_tdata_int = shift_eth_payload_axis_tdata;
+        m_axis_tkeep_int = shift_eth_payload_axis_tkeep;
+        m_axis_tlast_int = shift_eth_payload_axis_tlast;
+        m_axis_tuser_int = shift_eth_payload_axis_tuser;
+
         if ((s_eth_payload_axis_tready && s_eth_payload_axis_tvalid) || (m_axis_tready_int_reg && shift_eth_payload_axis_extra_cycle_reg)) begin
             transfer_in_save = 1'b1;
 
-            m_axis_tdata_int = shift_eth_payload_axis_tdata;
-            m_axis_tkeep_int = shift_eth_payload_axis_tkeep;
             m_axis_tvalid_int = 1'b1;
-            m_axis_tlast_int = shift_eth_payload_axis_tlast;
-            m_axis_tuser_int = shift_eth_payload_axis_tuser;
 
             if (shift_eth_payload_axis_tlast) begin
                 flush_save = 1'b1;
-- 
GitLab