diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-04-09 09:28:41 +0200 | 
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-04-09 09:28:41 +0200 | 
| commit | 0e6ebfd163645d300fdf4abedd1718195ad293bc (patch) | |
| tree | 510614aa8a43af846e27c7581adda801eaf03fc6 /drivers/net/ethernet/intel/ice/ice_sched.c | |
| parent | 186d7ef52c1f0c41450dedbdf6d6325d0a84e4c5 (diff) | |
| parent | fec50db7033ea478773b159e0e2efb135270e3b7 (diff) | |
Merge tag 'v6.9-rc3' into x86/cpu, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_sched.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_sched.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_sched.c b/drivers/net/ethernet/intel/ice/ice_sched.c index d174a4eeb899..a1525992d14b 100644 --- a/drivers/net/ethernet/intel/ice/ice_sched.c +++ b/drivers/net/ethernet/intel/ice/ice_sched.c @@ -237,7 +237,7 @@ static int  ice_sched_remove_elems(struct ice_hw *hw, struct ice_sched_node *parent,  		       u32 node_teid)  { -	DEFINE_FLEX(struct ice_aqc_delete_elem, buf, teid, 1); +	DEFINE_RAW_FLEX(struct ice_aqc_delete_elem, buf, teid, 1);  	u16 buf_size = __struct_size(buf);  	u16 num_groups_removed = 0;  	int status; @@ -2219,7 +2219,7 @@ int  ice_sched_move_nodes(struct ice_port_info *pi, struct ice_sched_node *parent,  		     u16 num_items, u32 *list)  { -	DEFINE_FLEX(struct ice_aqc_move_elem, buf, teid, 1); +	DEFINE_RAW_FLEX(struct ice_aqc_move_elem, buf, teid, 1);  	u16 buf_len = __struct_size(buf);  	struct ice_sched_node *node;  	u16 i, grps_movd = 0;  | 
