---

yaml
---
r: 341687
b: refs/heads/master
c: 876be08
h: refs/heads/master
i:
  341685: 7e4228a
  341683: 31105a2
  341679: 44a85b2
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3771a35bebeea16c4fd94d1116010cc02b1f75e
+refs/heads/master: 876be083b669c43203c0ee8709d749896e1d8d60

trunk/drivers/net/ethernet/sfc/mcdi.c

@@ -207,7 +207,9 @@ static int efx_mcdi_poll(struct efx_nic *efx)
 	return 0;
 }
 
-/* Test and clear MC-rebooted flag for this port/function */
+/* Test and clear MC-rebooted flag for this port/function; reset
+ * software state as necessary.
+ */
 int efx_mcdi_poll_reboot(struct efx_nic *efx)
 {
 	unsigned int addr = FR_CZ_MC_TREG_SMEM + MCDI_STATUS(efx);
@@ -223,6 +225,11 @@ int efx_mcdi_poll_reboot(struct efx_nic *efx)
 	if (value == 0)
 		return 0;
 
+	/* MAC statistics have been cleared on the NIC; clear our copy
+	 * so that efx_update_diff_stat() can continue to work.
+	 */
+	memset(&efx->mac_stats, 0, sizeof(efx->mac_stats));
+
 	EFX_ZERO_DWORD(reg);
 	efx_writed(efx, &reg, addr);