Skip to content

Commit 26831d7

Browse files
committed
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 <[email protected]>
2 parents 966a5c0 + 1b0cde4 commit 26831d7

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/net/ethernet/sfc/siena.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -948,8 +948,8 @@ static int siena_mtd_probe(struct efx_nic *efx)
948948

949949
#endif /* CONFIG_SFC_MTD */
950950

951-
unsigned int siena_check_caps(const struct efx_nic *efx,
952-
u8 flag, u32 offset)
951+
static unsigned int siena_check_caps(const struct efx_nic *efx,
952+
u8 flag, u32 offset)
953953
{
954954
/* Siena did not support MC_CMD_GET_CAPABILITIES */
955955
return 0;
@@ -1093,4 +1093,5 @@ const struct efx_nic_type siena_a0_nic_type = {
10931093
1 << HWTSTAMP_FILTER_PTP_V1_L4_EVENT |
10941094
1 << HWTSTAMP_FILTER_PTP_V2_L4_EVENT),
10951095
.rx_hash_key_size = 16,
1096+
.check_caps = siena_check_caps,
10961097
};

0 commit comments

Comments
 (0)