| Message ID | 20201203231314.1483198-1-arnd@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | net/mlx5e: fix non-IPV6 build | expand |
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
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
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 :)
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) {