| Message ID | 20201122211231.5682-1-rdunlap@infradead.org (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: mlx5e: fix fs_tcp.c build when IPV6 is not enabled | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | warning | Target tree name not specified in the subject |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 14 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
On 11/22/2020 11:12 PM, Randy Dunlap wrote: > Fix build when CONFIG_IPV6 is not enabled by making a function > be built conditionally. > > Fixes these build errors and warnings: > > ../drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c: In function 'accel_fs_tcp_set_ipv6_flow': > ../include/net/sock.h:380:34: error: 'struct sock_common' has no member named 'skc_v6_daddr'; did you mean 'skc_daddr'? > 380 | #define sk_v6_daddr __sk_common.skc_v6_daddr > | ^~~~~~~~~~~~ > ../drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c:55:14: note: in expansion of macro 'sk_v6_daddr' > 55 | &sk->sk_v6_daddr, 16); > | ^~~~~~~~~~~ > At top level: > ../drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c:47:13: warning: 'accel_fs_tcp_set_ipv6_flow' defined but not used [-Wunused-function] > 47 | static void accel_fs_tcp_set_ipv6_flow(struct mlx5_flow_spec *spec, struct sock *sk) > > Fixes: 5229a96e59ec ("net/mlx5e: Accel, Expose flow steering API for rules add/del") > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> > Reported-by: kernel test robot <lkp@intel.com> > Cc: Saeed Mahameed <saeedm@nvidia.com> > Cc: Boris Pismenny <borisp@nvidia.com> > Cc: Tariq Toukan <tariqt@mellanox.com> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: Jakub Kicinski <kuba@kernel.org> > --- Reviewed-by: Tariq Toukan <tariqt@nvidia.com> Thanks for your patch.
On Mon, 2020-11-23 at 12:08 +0200, Tariq Toukan wrote: > > On 11/22/2020 11:12 PM, Randy Dunlap wrote: > > Fix build when CONFIG_IPV6 is not enabled by making a function > > be built conditionally. > > > > Fixes these build errors and warnings: > > > > ../drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c: In > > function 'accel_fs_tcp_set_ipv6_flow': > > ../include/net/sock.h:380:34: error: 'struct sock_common' has no > > member named 'skc_v6_daddr'; did you mean 'skc_daddr'? > > 380 | #define sk_v6_daddr __sk_common.skc_v6_daddr > > | ^~~~~~~~~~~~ > > ../drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c:55:14: > > note: in expansion of macro 'sk_v6_daddr' > > 55 | &sk->sk_v6_daddr, 16); > > | ^~~~~~~~~~~ > > At top level: > > ../drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c:47:13: > > warning: 'accel_fs_tcp_set_ipv6_flow' defined but not used [- > > Wunused-function] > > 47 | static void accel_fs_tcp_set_ipv6_flow(struct > > mlx5_flow_spec *spec, struct sock *sk) > > > > Fixes: 5229a96e59ec ("net/mlx5e: Accel, Expose flow steering API > > for rules add/del") > > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> > > Reported-by: kernel test robot <lkp@intel.com> > > Cc: Saeed Mahameed <saeedm@nvidia.com> > > Cc: Boris Pismenny <borisp@nvidia.com> > > Cc: Tariq Toukan <tariqt@mellanox.com> > > Cc: "David S. Miller" <davem@davemloft.net> > > Cc: Jakub Kicinski <kuba@kernel.org> > > --- > > Reviewed-by: Tariq Toukan <tariqt@nvidia.com> > > Applied to net-mlx5, Thanks!
--- linux-next-20201120.orig/drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c +++ linux-next-20201120/drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c @@ -44,6 +44,7 @@ static void accel_fs_tcp_set_ipv4_flow(s 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(s outer_headers.dst_ipv4_dst_ipv6.ipv6_layout.ipv6), 0xff, 16); } +#endif void mlx5e_accel_fs_del_sk(struct mlx5_flow_handle *rule) {
Fix build when CONFIG_IPV6 is not enabled by making a function be built conditionally. Fixes these build errors and warnings: ../drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c: In function 'accel_fs_tcp_set_ipv6_flow': ../include/net/sock.h:380:34: error: 'struct sock_common' has no member named 'skc_v6_daddr'; did you mean 'skc_daddr'? 380 | #define sk_v6_daddr __sk_common.skc_v6_daddr | ^~~~~~~~~~~~ ../drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c:55:14: note: in expansion of macro 'sk_v6_daddr' 55 | &sk->sk_v6_daddr, 16); | ^~~~~~~~~~~ At top level: ../drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c:47:13: warning: 'accel_fs_tcp_set_ipv6_flow' defined but not used [-Wunused-function] 47 | static void accel_fs_tcp_set_ipv6_flow(struct mlx5_flow_spec *spec, struct sock *sk) Fixes: 5229a96e59ec ("net/mlx5e: Accel, Expose flow steering API for rules add/del") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Reported-by: kernel test robot <lkp@intel.com> Cc: Saeed Mahameed <saeedm@nvidia.com> Cc: Boris Pismenny <borisp@nvidia.com> Cc: Tariq Toukan <tariqt@mellanox.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jakub Kicinski <kuba@kernel.org> --- drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c | 2 ++ 1 file changed, 2 insertions(+)