* [PATCH net-next 0/2] sfc: siena_check_caps fixups
@ 2020-05-12 13:23 Edward Cree
2020-05-12 13:24 ` [PATCH net-next 1/2] sfc: actually wire up siena_check_caps() Edward Cree
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Edward Cree @ 2020-05-12 13:23 UTC (permalink / raw)
To: linux-net-drivers, davem; +Cc: netdev
Fix a bug and a build warning introduced in a recent refactor.
Edward Cree (2):
sfc: actually wire up siena_check_caps()
sfc: siena_check_caps() can be static
drivers/net/ethernet/sfc/siena.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH net-next 1/2] sfc: actually wire up siena_check_caps()
2020-05-12 13:23 [PATCH net-next 0/2] sfc: siena_check_caps fixups Edward Cree
@ 2020-05-12 13:24 ` Edward Cree
2020-05-12 13:24 ` [PATCH net-next 2/2] sfc: siena_check_caps() can be static Edward Cree
2020-05-12 19:48 ` [PATCH net-next 0/2] sfc: siena_check_caps fixups David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Edward Cree @ 2020-05-12 13:24 UTC (permalink / raw)
To: linux-net-drivers, davem; +Cc: netdev
Assign it to siena_a0_nic_type.check_caps function pointer.
Fixes: be904b855200 ("sfc: make capability checking a nic_type function")
Signed-off-by: Edward Cree <ecree@solarflare.com>
---
drivers/net/ethernet/sfc/siena.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ethernet/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c
index ed1cb6caa69d..d8b052979b1b 100644
--- a/drivers/net/ethernet/sfc/siena.c
+++ b/drivers/net/ethernet/sfc/siena.c
@@ -1093,4 +1093,5 @@ const struct efx_nic_type siena_a0_nic_type = {
1 << HWTSTAMP_FILTER_PTP_V1_L4_EVENT |
1 << HWTSTAMP_FILTER_PTP_V2_L4_EVENT),
.rx_hash_key_size = 16,
+ .check_caps = siena_check_caps,
};
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH net-next 2/2] sfc: siena_check_caps() can be static
2020-05-12 13:23 [PATCH net-next 0/2] sfc: siena_check_caps fixups Edward Cree
2020-05-12 13:24 ` [PATCH net-next 1/2] sfc: actually wire up siena_check_caps() Edward Cree
@ 2020-05-12 13:24 ` Edward Cree
2020-05-12 19:48 ` [PATCH net-next 0/2] sfc: siena_check_caps fixups David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Edward Cree @ 2020-05-12 13:24 UTC (permalink / raw)
To: linux-net-drivers, davem; +Cc: netdev
Reported-by: Jakub Kicinski <kuba@kernel.org>
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Edward Cree <ecree@solarflare.com>
---
drivers/net/ethernet/sfc/siena.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c
index d8b052979b1b..891e9fb6abec 100644
--- a/drivers/net/ethernet/sfc/siena.c
+++ b/drivers/net/ethernet/sfc/siena.c
@@ -948,8 +948,8 @@ static int siena_mtd_probe(struct efx_nic *efx)
#endif /* CONFIG_SFC_MTD */
-unsigned int siena_check_caps(const struct efx_nic *efx,
- u8 flag, u32 offset)
+static unsigned int siena_check_caps(const struct efx_nic *efx,
+ u8 flag, u32 offset)
{
/* Siena did not support MC_CMD_GET_CAPABILITIES */
return 0;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next 0/2] sfc: siena_check_caps fixups
2020-05-12 13:23 [PATCH net-next 0/2] sfc: siena_check_caps fixups Edward Cree
2020-05-12 13:24 ` [PATCH net-next 1/2] sfc: actually wire up siena_check_caps() Edward Cree
2020-05-12 13:24 ` [PATCH net-next 2/2] sfc: siena_check_caps() can be static Edward Cree
@ 2020-05-12 19:48 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2020-05-12 19:48 UTC (permalink / raw)
To: ecree; +Cc: linux-net-drivers, netdev
From: Edward Cree <ecree@solarflare.com>
Date: Tue, 12 May 2020 14:23:03 +0100
> Fix a bug and a build warning introduced in a recent refactor.
Series applied, thanks Ed.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-05-12 19:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-12 13:23 [PATCH net-next 0/2] sfc: siena_check_caps fixups Edward Cree
2020-05-12 13:24 ` [PATCH net-next 1/2] sfc: actually wire up siena_check_caps() Edward Cree
2020-05-12 13:24 ` [PATCH net-next 2/2] sfc: siena_check_caps() can be static Edward Cree
2020-05-12 19:48 ` [PATCH net-next 0/2] sfc: siena_check_caps fixups David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).