* [PATCH] net/mlx5e: fix non-IPV6 build
@ 2020-12-03 23:12 Arnd Bergmann
2020-12-03 23:17 ` Randy Dunlap
2020-12-04 1:20 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 4+ messages in thread
From: Arnd Bergmann @ 2020-12-03 23:12 UTC (permalink / raw)
To: Saeed Mahameed, Leon Romanovsky, David S. Miller, Jakub Kicinski,
Tariq Toukan, Maxim Mikityanskiy
Cc: Arnd Bergmann, Boris Pismenny, Denis Efremov, netdev, linux-rdma,
linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
When IPv6 is disabled, the flow steering code causes a build failure:
drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c:55:14: error: no member named 'skc_v6_daddr' in 'struct sock_common'; did you mean 'skc_daddr'?
&sk->sk_v6_daddr, 16);
^
include/net/sock.h:380:34: note: expanded from macro 'sk_v6_daddr'
#define sk_v6_daddr __sk_common.skc_v6_daddr
Hide the newly added function in an #ifdef that matches its callers
and the struct member definition.
Fixes: 5229a96e59ec ("net/mlx5e: Accel, Expose flow steering API for rules add/del")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c
index 97f1594cee11..e51f60b55daa 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c
@@ -44,6 +44,7 @@ static void accel_fs_tcp_set_ipv4_flow(struct mlx5_flow_spec *spec, struct sock
outer_headers.dst_ipv4_dst_ipv6.ipv4_layout.ipv4);
}
+#if IS_ENABLED(CONFIG_IPV6)
static void accel_fs_tcp_set_ipv6_flow(struct mlx5_flow_spec *spec, struct sock *sk)
{
MLX5_SET_TO_ONES(fte_match_param, spec->match_criteria, outer_headers.ip_protocol);
@@ -63,6 +64,7 @@ static void accel_fs_tcp_set_ipv6_flow(struct mlx5_flow_spec *spec, struct sock
outer_headers.dst_ipv4_dst_ipv6.ipv6_layout.ipv6),
0xff, 16);
}
+#endif
void mlx5e_accel_fs_del_sk(struct mlx5_flow_handle *rule)
{
--
2.27.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] net/mlx5e: fix non-IPV6 build
2020-12-03 23:12 [PATCH] net/mlx5e: fix non-IPV6 build Arnd Bergmann
@ 2020-12-03 23:17 ` Randy Dunlap
2020-12-04 1:20 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 4+ messages in thread
From: Randy Dunlap @ 2020-12-03 23:17 UTC (permalink / raw)
To: Arnd Bergmann, Saeed Mahameed, Leon Romanovsky, David S. Miller,
Jakub Kicinski, Tariq Toukan, Maxim Mikityanskiy
Cc: Arnd Bergmann, Boris Pismenny, Denis Efremov, netdev, linux-rdma,
linux-kernel
On 12/3/20 3:12 PM, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> When IPv6 is disabled, the flow steering code causes a build failure:
>
> drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c:55:14: error: no member named 'skc_v6_daddr' in 'struct sock_common'; did you mean 'skc_daddr'?
> &sk->sk_v6_daddr, 16);
> ^
> include/net/sock.h:380:34: note: expanded from macro 'sk_v6_daddr'
> #define sk_v6_daddr __sk_common.skc_v6_daddr
>
> Hide the newly added function in an #ifdef that matches its callers
> and the struct member definition.
>
> Fixes: 5229a96e59ec ("net/mlx5e: Accel, Expose flow steering API for rules add/del")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c
> index 97f1594cee11..e51f60b55daa 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c
> @@ -44,6 +44,7 @@ static void accel_fs_tcp_set_ipv4_flow(struct mlx5_flow_spec *spec, struct sock
> outer_headers.dst_ipv4_dst_ipv6.ipv4_layout.ipv4);
> }
>
> +#if IS_ENABLED(CONFIG_IPV6)
> static void accel_fs_tcp_set_ipv6_flow(struct mlx5_flow_spec *spec, struct sock *sk)
> {
> MLX5_SET_TO_ONES(fte_match_param, spec->match_criteria, outer_headers.ip_protocol);
> @@ -63,6 +64,7 @@ static void accel_fs_tcp_set_ipv6_flow(struct mlx5_flow_spec *spec, struct sock
> outer_headers.dst_ipv4_dst_ipv6.ipv6_layout.ipv6),
> 0xff, 16);
> }
> +#endif
>
> void mlx5e_accel_fs_del_sk(struct mlx5_flow_handle *rule)
> {
>
Fix for this was just merged by Linus [NETWORKING PR].
thanks.
--
~Randy
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] net/mlx5e: fix non-IPV6 build
2020-12-03 23:12 [PATCH] net/mlx5e: fix non-IPV6 build Arnd Bergmann
2020-12-03 23:17 ` Randy Dunlap
@ 2020-12-04 1:20 ` patchwork-bot+netdevbpf
2020-12-04 1:47 ` Jakub Kicinski
1 sibling, 1 reply; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2020-12-04 1:20 UTC (permalink / raw)
To: Arnd Bergmann
Cc: saeedm, leon, davem, kuba, tariqt, maximmi, arnd, borisp,
efremov, netdev, linux-rdma, linux-kernel
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
On Fri, 4 Dec 2020 00:12:59 +0100 you wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> When IPv6 is disabled, the flow steering code causes a build failure:
>
> drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c:55:14: error: no member named 'skc_v6_daddr' in 'struct sock_common'; did you mean 'skc_daddr'?
> &sk->sk_v6_daddr, 16);
> ^
> include/net/sock.h:380:34: note: expanded from macro 'sk_v6_daddr'
> #define sk_v6_daddr __sk_common.skc_v6_daddr
>
> [...]
Here is the summary with links:
- net/mlx5e: fix non-IPV6 build
https://git.kernel.org/netdev/net-next/c/8a78a440108e
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] net/mlx5e: fix non-IPV6 build
2020-12-04 1:20 ` patchwork-bot+netdevbpf
@ 2020-12-04 1:47 ` Jakub Kicinski
0 siblings, 0 replies; 4+ messages in thread
From: Jakub Kicinski @ 2020-12-04 1:47 UTC (permalink / raw)
To: patchwork-bot+netdevbpf
Cc: Arnd Bergmann, saeedm, leon, davem, tariqt, maximmi, arnd,
borisp, efremov, netdev, linux-rdma, linux-kernel
On Fri, 04 Dec 2020 01:20:15 +0000 patchwork-bot+netdevbpf@kernel.org
wrote:
> Hello:
>
> This patch was applied to netdev/net-next.git (refs/heads/master):
>
> On Fri, 4 Dec 2020 00:12:59 +0100 you wrote:
> > From: Arnd Bergmann <arnd@arndb.de>
> >
> > When IPv6 is disabled, the flow steering code causes a build failure:
> >
> > drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c:55:14: error: no member named 'skc_v6_daddr' in 'struct sock_common'; did you mean 'skc_daddr'?
> > &sk->sk_v6_daddr, 16);
> > ^
> > include/net/sock.h:380:34: note: expanded from macro 'sk_v6_daddr'
> > #define sk_v6_daddr __sk_common.skc_v6_daddr
> >
> > [...]
>
> Here is the summary with links:
> - net/mlx5e: fix non-IPV6 build
> https://git.kernel.org/netdev/net-next/c/8a78a440108e
>
> You are awesome, thank you!
> --
> Deet-doot-dot, I am a bot.
> https://korg.docs.kernel.org/patchwork/pwbot.html
Heh, it appears you managed to create a similar enough patch for the
patchwork bot to confuse the two :)
So to be clear this was not applied :)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-12-04 1:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-03 23:12 [PATCH] net/mlx5e: fix non-IPV6 build Arnd Bergmann
2020-12-03 23:17 ` Randy Dunlap
2020-12-04 1:20 ` patchwork-bot+netdevbpf
2020-12-04 1:47 ` Jakub Kicinski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).