Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e270e966 authored by Andrew Morton's avatar Andrew Morton Committed by David S. Miller
Browse files

drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c: fix build with gcc-4.4.4 



drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c: In function 'mlx5e_set_rxfh':
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:1067: error: unknown field 'rss' specified in initializer
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:1067: warning: missing braces around initializer
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:1067: warning: (near initialization for 'rrp.<anonymous>')
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:1068: error: unknown field 'rss' specified in initializer
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:1069: warning: excess elements in struct initializer
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:1069: warning: (near initialization for 'rrp')

gcc-4.4.4 has issues with anonymous union initializers.  Work around this.

Cc: Saeed Mahameed <saeedm@mellanox.com>
Cc: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 95632791

drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c

+6 −2
Original line number Diff line number Diff line
@@ -1064,8 +1064,12 @@ static int mlx5e_set_rxfh(struct net_device *dev, const u32 *indir, 
			u32 rqtn = priv->indir_rqt.rqtn;

			struct mlx5e_redirect_rqt_param rrp = {

				.is_rss = true,

				.rss.hfunc = priv->channels.params.rss_hfunc,

				.rss.channels  = &priv->channels

				{

					.rss = {

						.hfunc = priv->channels.params.rss_hfunc,

						.channels  = &priv->channels,

					},

				},

			};



			mlx5e_redirect_rqt(priv, rqtn, MLX5E_INDIR_RQT_SIZE, rrp);