| Message ID | 20200605013632.781-1-tseewald@gmail.com |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | [v2] cxgb4: Fix 'defined but not used' warning for cxgb4_uld_in_use() | expand |
From: Tom Seewald <tseewald@gmail.com> Date: Thu, 4 Jun 2020 20:36:32 -0500 > The only user of cxgb4_uld_in_use() is cxgb4_set_ktls_feature() which is > only available when CONFIG_CHELSIO_TLS_DEVICE=y. To avoid this compiler > warning when CONFIG_CHELSIO_TLS_DEVICE=n, place cxgb4_uld_in_use() behind > the same ifdef. > > Signed-off-by: Tom Seewald <tseewald@gmail.com> This doesn't apply to the net GIT tree.
> This doesn't apply to the net GIT tree.
Apologies, this fix is for net-next. Let me know if I should resend.
Thanks
Looks like this has already been fixed in net, sorry for the noise.
From: Tom Seewald <tseewald@gmail.com> Date: Sat, 6 Jun 2020 01:04:21 -0500 >> This doesn't apply to the net GIT tree. > Apologies, this fix is for net-next. Let me know if I should resend. Right now net == net-next, and no new changes are going into net-next.
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c index 0307e9c69a47..08439e215efe 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c @@ -663,6 +663,7 @@ static int uld_attach(struct adapter *adap, unsigned int uld) return 0; } +#ifdef CONFIG_CHELSIO_TLS_DEVICE static bool cxgb4_uld_in_use(struct adapter *adap) { const struct tid_info *t = &adap->tids; @@ -670,7 +671,6 @@ static bool cxgb4_uld_in_use(struct adapter *adap) return (atomic_read(&t->conns_in_use) || t->stids_in_use); } -#ifdef CONFIG_CHELSIO_TLS_DEVICE /* cxgb4_set_ktls_feature: request FW to enable/disable ktls settings. * @adap: adapter info * @enable: 1 to enable / 0 to disable ktls settings.
The only user of cxgb4_uld_in_use() is cxgb4_set_ktls_feature() which is only available when CONFIG_CHELSIO_TLS_DEVICE=y. To avoid this compiler warning when CONFIG_CHELSIO_TLS_DEVICE=n, place cxgb4_uld_in_use() behind the same ifdef. Signed-off-by: Tom Seewald <tseewald@gmail.com> --- drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)