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

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.frSigned-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 53c6b86c
...@@ -220,16 +220,13 @@ static struct mask_array *tbl_mask_array_alloc(int size) ...@@ -220,16 +220,13 @@ static struct mask_array *tbl_mask_array_alloc(int size)
struct mask_array *new; struct mask_array *new;
size = max(MASK_ARRAY_SIZE_MIN, size); size = max(MASK_ARRAY_SIZE_MIN, size);
new = kzalloc(sizeof(struct mask_array) + new = kzalloc(struct_size(new, masks, size) +
sizeof(struct sw_flow_mask *) * size +
sizeof(u64) * size, GFP_KERNEL); sizeof(u64) * size, GFP_KERNEL);
if (!new) if (!new)
return NULL; return NULL;
new->masks_usage_zero_cntr = (u64 *)((u8 *)new + new->masks_usage_zero_cntr = (u64 *)((u8 *)new +
sizeof(struct mask_array) + struct_size(new, masks, size));
sizeof(struct sw_flow_mask *) *
size);
new->masks_usage_stats = __alloc_percpu(sizeof(struct mask_array_stats) + new->masks_usage_stats = __alloc_percpu(sizeof(struct mask_array_stats) +
sizeof(u64) * size, sizeof(u64) * size,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment