Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+3 -2
+3 -2
drivers/net/ethernet/sfc/siena.c
··· 948 948 949 949 #endif /* CONFIG_SFC_MTD */ 950 950 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) 953 953 { 954 954 /* Siena did not support MC_CMD_GET_CAPABILITIES */ 955 955 return 0; ··· 1093 1093 1 << HWTSTAMP_FILTER_PTP_V1_L4_EVENT | 1094 1094 1 << HWTSTAMP_FILTER_PTP_V2_L4_EVENT), 1095 1095 .rx_hash_key_size = 16, 1096 + .check_caps = siena_check_caps, 1096 1097 };