2017-06-09 10:38:01

by Arnd Bergmann

Subject: [PATCH net-next] qed: add qed_int_sb_init() stub function

When CONFIG_QED_SRIOV is disabled, we get a build error:

drivers/net/ethernet/qlogic/qed/qed_int.c: In function 'qed_int_sb_init':
drivers/net/ethernet/qlogic/qed/qed_int.c:1499:4: error: implicit declaration of function 'qed_vf_set_sb_info'; did you mean 'qed_mcp_get_resc_info'? [-Werror=implicit-function-declaration]

All the other declarations have a 'static inline' stub as an alternative
here, so this adds one more for qed_int_sb_init.

Fixes: 50a207147fce ("qed: Hold a single array for SBs")
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/net/ethernet/qlogic/qed/qed_vf.h | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/drivers/net/ethernet/qlogic/qed/qed_vf.h b/drivers/net/ethernet/qlogic/qed/qed_vf.h
index b65bbc54a097..34d9b882a780 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_vf.h
+++ b/drivers/net/ethernet/qlogic/qed/qed_vf.h
@@ -1105,6 +1105,11 @@ static inline u16 qed_vf_get_igu_sb_id(struct qed_hwfn *p_hwfn, u16 sb_id)
return 0;
}

+static inline void qed_vf_set_sb_info(struct qed_hwfn *p_hwfn, u16 sb_id,
+ struct qed_sb_info *p_sb)
+{
+}
+
static inline int qed_vf_pf_vport_start(struct qed_hwfn *p_hwfn,
u8 vport_id,
u16 mtu,
--
2.9.0

2017-06-09 13:44:19

by Mintz, Yuval

Subject: RE: [PATCH net-next] qed: add qed_int_sb_init() stub function

> When CONFIG_QED_SRIOV is disabled, we get a build error:
>
> drivers/net/ethernet/qlogic/qed/qed_int.c: In function 'qed_int_sb_init':
> drivers/net/ethernet/qlogic/qed/qed_int.c:1499:4: error: implicit declaration
> of function 'qed_vf_set_sb_info'; did you mean 'qed_mcp_get_resc_info'? [-
> Werror=implicit-function-declaration]
>
> All the other declarations have a 'static inline' stub as an alternative here, so
> this adds one more for qed_int_sb_init.
>
> Fixes: 50a207147fce ("qed: Hold a single array for SBs")
> Signed-off-by: Arnd Bergmann <[email protected]>

Missed it. Thanks.
Acked-by: Yuval Mintz <[email protected]>

2017-06-09 19:52:12

by David Miller

Subject: Re: [PATCH net-next] qed: add qed_int_sb_init() stub function

From: Arnd Bergmann <[email protected]>
Date: Fri, 9 Jun 2017 12:37:35 +0200

> When CONFIG_QED_SRIOV is disabled, we get a build error:
>
> drivers/net/ethernet/qlogic/qed/qed_int.c: In function 'qed_int_sb_init':
> drivers/net/ethernet/qlogic/qed/qed_int.c:1499:4: error: implicit declaration of function 'qed_vf_set_sb_info'; did you mean 'qed_mcp_get_resc_info'? [-Werror=implicit-function-declaration]
>
> All the other declarations have a 'static inline' stub as an alternative
> here, so this adds one more for qed_int_sb_init.
>
> Fixes: 50a207147fce ("qed: Hold a single array for SBs")
> Signed-off-by: Arnd Bergmann <[email protected]>

Applied, thank you.