Commit df3bf90f authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Paolo Abeni
Browse files

net: openvswitch: Use struct_size() 



Use struct_size() instead of hand writing it.
This is less verbose and more robust.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/e5122b4ff878cbf3ed72653a395ad5c4da04dc1e.1697264974.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 53c6b86c

net/openvswitch/flow_table.c

+2 −5
Original line number Diff line number Diff line
@@ -220,16 +220,13 @@ static struct mask_array *tbl_mask_array_alloc(int size) 
	struct mask_array *new;



	size = max(MASK_ARRAY_SIZE_MIN, size);

	new = kzalloc(sizeof(struct mask_array) +

		      sizeof(struct sw_flow_mask *) * size +

	new = kzalloc(struct_size(new, masks, size) +

		      sizeof(u64) * size, GFP_KERNEL);

	if (!new)

		return NULL;



	new->masks_usage_zero_cntr = (u64 *)((u8 *)new +

					     sizeof(struct mask_array) +

					     sizeof(struct sw_flow_mask *) *

					     size);

					     struct_size(new, masks, size));



	new->masks_usage_stats = __alloc_percpu(sizeof(struct mask_array_stats) +

						sizeof(u64) * size,