sfc: Merge efx_mac_operations into efx_nic_type

No NICs need to switch efx_mac_operations at run-time, and the MAC
operations are fairly closely bound to NIC types.

Move efx_mac_operations::reconfigure to efx_nic_type::reconfigure_mac
and efx_mac_operations::check_fault fo efx_nic_type::check_mac_fault.
Change callers to call through efx->type or directly if the NIC type
is known.

Remove efx_mac_operations::update_stats.  The implementations for
Falcon used to fetch MAC statistics synchronously and this was used by
efx_register_netdev() to clear statistics after running self-tests.
However, it now only converts statistics that have already been
fetched (and that only for Falcon), and the call from
efx_register_netdev() has no effect.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/ethernet/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c
index 4d5d619feaa6..775b6784cbdb 100644
--- a/drivers/net/ethernet/sfc/siena.c
+++ b/drivers/net/ethernet/sfc/siena.c
@@ -18,7 +18,6 @@
 #include "bitfield.h"
 #include "efx.h"
 #include "nic.h"
-#include "mac.h"
 #include "spi.h"
 #include "regs.h"
 #include "io.h"
@@ -631,13 +630,14 @@ const struct efx_nic_type siena_a0_nic_type = {
         .set_id_led = efx_mcdi_set_id_led,
         .push_irq_moderation = siena_push_irq_moderation,
         .push_multicast_hash = siena_push_multicast_hash,
+        .reconfigure_mac = efx_mcdi_mac_reconfigure,
+        .check_mac_fault = efx_mcdi_mac_check_fault,
         .reconfigure_port = efx_mcdi_phy_reconfigure,
         .get_wol = siena_get_wol,
         .set_wol = siena_set_wol,
         .resume_wol = siena_init_wol,
         .test_registers = siena_test_registers,
         .test_nvram = efx_mcdi_nvram_test_all,
-        .default_mac_ops = &efx_mcdi_mac_operations,
 
         .revision = EFX_REV_SIENA_A0,
         .mem_map_size = (FR_CZ_MC_TREG_SMEM +