diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-12 22:47:40 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-12 22:47:40 +0300 |
| commit | 26831d781496bcc2b749d07738595f1979662ffd (patch) | |
| tree | 664f279ab80f2083298e1f0cc751c6280bb7e881 | |
| parent | 966a5c08af1b1399fe1014f24877578e8493ffe1 (diff) | |
| parent | 1b0cde4091877cd7fe4b29f67645cc391b86c9ca (diff) | |
| download | linux-26831d781496bcc2b749d07738595f1979662ffd.tar.xz | |
Merge branch 'sfc-siena_check_caps-fixups'
Edward Cree says:
====================
sfc: siena_check_caps fixups
Fix a bug and a build warning introduced in a recent refactor.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/sfc/siena.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c index ed1cb6caa69d..891e9fb6abec 100644 --- a/drivers/net/ethernet/sfc/siena.c +++ b/drivers/net/ethernet/sfc/siena.c @@ -948,8 +948,8 @@ fail: #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; @@ -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, }; |