| Message ID | 20190625152708.23729-1-Jes.Sorensen@gmail.com |
|---|---|
| Headers | show |
| Series | Fix broken build of mlx5 | expand |
On Tue, 2019-06-25 at 11:27 -0400, Jes Sorensen wrote: > From: Jes Sorensen <jsorensen@fb.com> > > This fixes an obvious build error that could have been caught by > simply building the code before pushing out the patch. > Hi Jes, Just tested again, as I have tested before submitting the blamed patch, and as we test on every single new patch in our build automation. both combinations CONFIG_MLX5_EN_RXNFC=y/n work on latest net-next, what am i missing ? > Cheers, > Jes > > > Jes Sorensen (1): > mlx5: Fix build when CONFIG_MLX5_EN_RXNFC is disabled > > drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >
On 6/25/19 1:54 PM, Saeed Mahameed wrote: > On Tue, 2019-06-25 at 11:27 -0400, Jes Sorensen wrote: >> From: Jes Sorensen <jsorensen@fb.com> >> >> This fixes an obvious build error that could have been caught by >> simply building the code before pushing out the patch. >> > > Hi Jes, > > Just tested again, as I have tested before submitting the blamed patch, > and as we test on every single new patch in our build automation. > > both combinations CONFIG_MLX5_EN_RXNFC=y/n work on latest net-next, > what am i missing ? Linus' tree: [jes@xpeas linux.git]$ grep mlx5e_get_rxnfc drivers/net/ethernet/mellanox/mlx5/core/*.c drivers/net/ethernet/mellanox/mlx5/core/en/*.h drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:static int mlx5e_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info, u32 *rule_locs) drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c: .get_rxnfc = mlx5e_get_rxnfc, drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c:int mlx5e_get_rxnfc(struct net_device *dev, drivers/net/ethernet/mellanox/mlx5/core/en/fs.h:int mlx5e_get_rxnfc(struct net_device *dev, static vs non static functions, with a prototype that is non static. Jes
On Tue, 2019-06-25 at 14:01 -0400, Jes Sorensen wrote: > On 6/25/19 1:54 PM, Saeed Mahameed wrote: > > On Tue, 2019-06-25 at 11:27 -0400, Jes Sorensen wrote: > > > From: Jes Sorensen <jsorensen@fb.com> > > > > > > This fixes an obvious build error that could have been caught by > > > simply building the code before pushing out the patch. > > > > > > > Hi Jes, > > > > Just tested again, as I have tested before submitting the blamed > > patch, > > and as we test on every single new patch in our build automation. > > > > both combinations CONFIG_MLX5_EN_RXNFC=y/n work on latest net-next, > > what am i missing ? > > Linus' tree: > > [jes@xpeas linux.git]$ grep mlx5e_get_rxnfc > drivers/net/ethernet/mellanox/mlx5/core/*.c > drivers/net/ethernet/mellanox/mlx5/core/en/*.h > drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:static int > mlx5e_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info, > u32 > *rule_locs) > drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c: .get_rxnfc > = mlx5e_get_rxnfc, > drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c:int > mlx5e_get_rxnfc(struct net_device *dev, > drivers/net/ethernet/mellanox/mlx5/core/en/fs.h:int > mlx5e_get_rxnfc(struct net_device *dev, > > static vs non static functions, with a prototype that is non static. But only one prototype can be selected and it is according CONFIG_MLX5_EN_RXNFC when CONFIG_MLX5_EN_RXNFC=n then the static prototype will be selected and the other one will be compiled out. when CONFIG_MLX5_EN_RXNFC=y the non static prototype will be selected and the static one will be compiled out. So no issue here. > > Jes
From: Jes Sorensen <jsorensen@fb.com> This fixes an obvious build error that could have been caught by simply building the code before pushing out the patch. Cheers, Jes Jes Sorensen (1): mlx5: Fix build when CONFIG_MLX5_EN_RXNFC is disabled drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)