[PATCH iwl-next v5 06/12] Revert "ice: remove unused ice_flow_entry fields"
From: Marcin Szycik <hidden>
Date: 2026-07-02 11:30:48
Also in:
intel-wired-lan
Subsystem:
intel ethernet drivers, networking drivers, the rest · Maintainers:
Tony Nguyen, Przemek Kitszel, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
This reverts commit 4cd7bc7144ec2c0bb27208c3bb1f153dfd44b1c7. These fields will be needed in the following commits. Signed-off-by: Marcin Szycik <redacted> Reviewed-by: Aleksandr Loktionov <redacted> Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> --- v2: * Add this patch --- drivers/net/ethernet/intel/ice/ice_flow.h | 3 +++ drivers/net/ethernet/intel/ice/ice_flow.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_flow.h b/drivers/net/ethernet/intel/ice/ice_flow.h
index 7357088091bd..23e366ee1f79 100644
--- a/drivers/net/ethernet/intel/ice/ice_flow.h
+++ b/drivers/net/ethernet/intel/ice/ice_flow.h@@ -458,8 +458,11 @@ struct ice_flow_entry { u64 id; struct ice_flow_prof *prof; + /* Flow entry's content */ + void *entry; enum ice_flow_priority priority; u16 vsi_handle; + u16 entry_sz; }; #define ICE_FLOW_ENTRY_HNDL(e) ((u64)(uintptr_t)e)
diff --git a/drivers/net/ethernet/intel/ice/ice_flow.c b/drivers/net/ethernet/intel/ice/ice_flow.c
index 855d296aeed8..e42367853253 100644
--- a/drivers/net/ethernet/intel/ice/ice_flow.c
+++ b/drivers/net/ethernet/intel/ice/ice_flow.c@@ -1604,6 +1604,7 @@ ice_flow_rem_entry_sync(struct ice_hw *hw, enum ice_block __always_unused blk, list_del(&entry->l_entry); + devm_kfree(ice_hw_to_dev(hw), entry->entry); devm_kfree(ice_hw_to_dev(hw), entry); return 0;
@@ -2024,8 +2025,10 @@ ice_flow_add_entry(struct ice_hw *hw, enum ice_block blk, u64 prof_id, *entry_h = ICE_FLOW_ENTRY_HNDL(e); out: - if (status) + if (status && e) { + devm_kfree(ice_hw_to_dev(hw), e->entry); devm_kfree(ice_hw_to_dev(hw), e); + } return status; }
--
2.49.0