Commit 26831d78 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 966a5c08 1b0cde40

drivers/net/ethernet/sfc/siena.c

+3 −2
Original line number Diff line number Diff line
@@ -948,7 +948,7 @@ fail: 


#endif /* CONFIG_SFC_MTD */



unsigned int siena_check_caps(const struct efx_nic *efx,

static unsigned int siena_check_caps(const struct efx_nic *efx,

				     u8 flag, u32 offset)

{

	/* Siena did not support MC_CMD_GET_CAPABILITIES */
@@ -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,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE