Commit 2bba19ff authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

team: avoid using variable-length array 

Apparently using variable-length array is not correct
(https://lkml.org/lkml/2011/10/23/25

). So remove it.

Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 234a8fd4

drivers/net/team/team.c

+7 −2
Original line number Diff line number Diff line
@@ -96,10 +96,13 @@ int team_options_register(struct team *team, 
			  size_t option_count)

{

	int i;

	struct team_option *dst_opts[option_count];

	struct team_option **dst_opts;

	int err;



	memset(dst_opts, 0, sizeof(dst_opts));

	dst_opts = kzalloc(sizeof(struct team_option *) * option_count,

			   GFP_KERNEL);

	if (!dst_opts)

		return -ENOMEM;

	for (i = 0; i < option_count; i++, option++) {

		struct team_option *dst_opt;
@@ -119,12 +122,14 @@ int team_options_register(struct team *team, 
	for (i = 0; i < option_count; i++)

		list_add_tail(&dst_opts[i]->list, &team->option_list);



	kfree(dst_opts);

	return 0;



rollback:

	for (i = 0; i < option_count; i++)

		kfree(dst_opts[i]);



	kfree(dst_opts);

	return err;

}