[PATCH] IB/mlx5: fix VFs callback function prototypes

[PATCH] IB/mlx5: fix VFs callback function prototypes

[Arnd Bergmann]

The previous patch that added a couple of callback functions put
the declarations inside of an #ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING,
which causes the build to fail if that option is disabled:

drivers/infiniband/hw/mlx5/main.c: In function 'mlx5_ib_add':
drivers/infiniband/hw/mlx5/main.c:2358:31: error: 'mlx5_ib_get_vf_config' undeclared (first use in this function)

This moves the four declarations below the #ifdef section so they
are always available.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: eff901d30e6c ("IB/mlx5: Implement callbacks for manipulating VFs")
---
 drivers/infiniband/hw/mlx5/mlx5_ib.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index f16c818ad2e6..b46c25542a7c 100644
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -776,15 +776,6 @@ void mlx5_ib_qp_disable_pagefaults(struct mlx5_ib_qp *qp);
 void mlx5_ib_qp_enable_pagefaults(struct mlx5_ib_qp *qp);
 void mlx5_ib_invalidate_range(struct ib_umem *umem, unsigned long start,
 			      unsigned long end);
-int mlx5_ib_get_vf_config(struct ib_device *device, int vf,
-			  u8 port, struct ifla_vf_info *info);
-int mlx5_ib_set_vf_link_state(struct ib_device *device, int vf,
-			      u8 port, int state);
-int mlx5_ib_get_vf_stats(struct ib_device *device, int vf,
-			 u8 port, struct ifla_vf_stats *stats);
-int mlx5_ib_set_vf_guid(struct ib_device *device, int vf, u8 port,
-			u64 guid, int type);
-
 #else /* CONFIG_INFINIBAND_ON_DEMAND_PAGING */
 static inline void mlx5_ib_internal_fill_odp_caps(struct mlx5_ib_dev *dev)
 {
@@ -801,6 +792,15 @@ static inline void mlx5_ib_qp_enable_pagefaults(struct mlx5_ib_qp *qp)  {}
 
 #endif /* CONFIG_INFINIBAND_ON_DEMAND_PAGING */
 
+int mlx5_ib_get_vf_config(struct ib_device *device, int vf,
+			  u8 port, struct ifla_vf_info *info);
+int mlx5_ib_set_vf_link_state(struct ib_device *device, int vf,
+			      u8 port, int state);
+int mlx5_ib_get_vf_stats(struct ib_device *device, int vf,
+			 u8 port, struct ifla_vf_stats *stats);
+int mlx5_ib_set_vf_guid(struct ib_device *device, int vf, u8 port,
+			u64 guid, int type);
+
 __be16 mlx5_get_roce_udp_sport(struct mlx5_ib_dev *dev, u8 port_num,
 			       int index);
 
-- 
2.7.0

Re: [PATCH] IB/mlx5: fix VFs callback function prototypes

[Leon Romanovsky]

On Wed, Mar 23, 2016 at 11:37:45AM +0100, Arnd Bergmann wrote:
> The previous patch that added a couple of callback functions put
> the declarations inside of an #ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING,
> which causes the build to fail if that option is disabled:
> 
> drivers/infiniband/hw/mlx5/main.c: In function 'mlx5_ib_add':
> drivers/infiniband/hw/mlx5/main.c:2358:31: error: 'mlx5_ib_get_vf_config' undeclared (first use in this function)
> 
> This moves the four declarations below the #ifdef section so they
> are always available.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: eff901d30e6c ("IB/mlx5: Implement callbacks for manipulating VFs")

Thanks,
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>

Re: [PATCH] IB/mlx5: fix VFs callback function prototypes

[Eli Cohen]

Reviewed-by: Eli Cohen <eli@mellanox.com>

Hi Doug,

are you going to take this fix.

Thanks,
Eli

On Wed, Mar 23, 2016 at 11:37:45AM +0100, Arnd Bergmann wrote:
> The previous patch that added a couple of callback functions put
> the declarations inside of an #ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING,
> which causes the build to fail if that option is disabled:
> 
> drivers/infiniband/hw/mlx5/main.c: In function 'mlx5_ib_add':
> drivers/infiniband/hw/mlx5/main.c:2358:31: error: 'mlx5_ib_get_vf_config' undeclared (first use in this function)
> 
> This moves the four declarations below the #ifdef section so they
> are always available.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: eff901d30e6c ("IB/mlx5: Implement callbacks for manipulating VFs")
> ---
>  drivers/infiniband/hw/mlx5/mlx5_ib.h | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
> index f16c818ad2e6..b46c25542a7c 100644
> --- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
> +++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
> @@ -776,15 +776,6 @@ void mlx5_ib_qp_disable_pagefaults(struct mlx5_ib_qp *qp);
>  void mlx5_ib_qp_enable_pagefaults(struct mlx5_ib_qp *qp);
>  void mlx5_ib_invalidate_range(struct ib_umem *umem, unsigned long start,
>  			      unsigned long end);
> -int mlx5_ib_get_vf_config(struct ib_device *device, int vf,
> -			  u8 port, struct ifla_vf_info *info);
> -int mlx5_ib_set_vf_link_state(struct ib_device *device, int vf,
> -			      u8 port, int state);
> -int mlx5_ib_get_vf_stats(struct ib_device *device, int vf,
> -			 u8 port, struct ifla_vf_stats *stats);
> -int mlx5_ib_set_vf_guid(struct ib_device *device, int vf, u8 port,
> -			u64 guid, int type);
> -
>  #else /* CONFIG_INFINIBAND_ON_DEMAND_PAGING */
>  static inline void mlx5_ib_internal_fill_odp_caps(struct mlx5_ib_dev *dev)
>  {
> @@ -801,6 +792,15 @@ static inline void mlx5_ib_qp_enable_pagefaults(struct mlx5_ib_qp *qp)  {}
>  
>  #endif /* CONFIG_INFINIBAND_ON_DEMAND_PAGING */
>  
> +int mlx5_ib_get_vf_config(struct ib_device *device, int vf,
> +			  u8 port, struct ifla_vf_info *info);
> +int mlx5_ib_set_vf_link_state(struct ib_device *device, int vf,
> +			      u8 port, int state);
> +int mlx5_ib_get_vf_stats(struct ib_device *device, int vf,
> +			 u8 port, struct ifla_vf_stats *stats);
> +int mlx5_ib_set_vf_guid(struct ib_device *device, int vf, u8 port,
> +			u64 guid, int type);
> +
>  __be16 mlx5_get_roce_udp_sport(struct mlx5_ib_dev *dev, u8 port_num,
>  			       int index);
>  
> -- 
> 2.7.0
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html