Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99831b1e authored by Edward Cree's avatar Edward Cree Committed by David S. Miller
Browse files

sfc: remove RESET_TYPE_RX_RECOVERY 



It's no longer used now that Falcon is gone.

Also remove a reference in a comment to an ioctl that doesn't exist.

Signed-off-by: default avatarEdward Cree <ecree@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d7d6caba

drivers/net/ethernet/sfc/efx.c

+0 −1
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ const char *const efx_reset_type_names[] = { 
	[RESET_TYPE_DISABLE]            = "DISABLE",

	[RESET_TYPE_TX_WATCHDOG]        = "TX_WATCHDOG",

	[RESET_TYPE_INT_ERROR]          = "INT_ERROR",

	[RESET_TYPE_RX_RECOVERY]        = "RX_RECOVERY",

	[RESET_TYPE_DMA_ERROR]          = "DMA_ERROR",

	[RESET_TYPE_TX_SKIP]            = "TX_SKIP",

	[RESET_TYPE_MC_FAILURE]         = "MC_FAILURE",

drivers/net/ethernet/sfc/enum.h

+1 −4
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ enum efx_loopback_mode { 
 * @RESET_TYPE_DISABLE: Reset datapath, MAC and PHY; leave NIC disabled

 * @RESET_TYPE_TX_WATCHDOG: reset due to TX watchdog

 * @RESET_TYPE_INT_ERROR: reset due to internal error

 * @RESET_TYPE_RX_RECOVERY: reset to recover from RX datapath errors

 * @RESET_TYPE_DMA_ERROR: DMA error

 * @RESET_TYPE_TX_SKIP: hardware completed empty tx descriptors

 * @RESET_TYPE_MC_FAILURE: MC reboot/assertion
@@ -166,15 +165,13 @@ enum reset_type { 
	RESET_TYPE_MAX_METHOD,

	RESET_TYPE_TX_WATCHDOG,

	RESET_TYPE_INT_ERROR,

	RESET_TYPE_RX_RECOVERY,

	RESET_TYPE_DMA_ERROR,

	RESET_TYPE_TX_SKIP,

	RESET_TYPE_MC_FAILURE,

	/* RESET_TYPE_MCDI_TIMEOUT is actually a method, not just a reason, but

	 * it doesn't fit the scope hierarchy (not well-ordered by inclusion).

	 * We encode this by having its enum value be greater than

	 * RESET_TYPE_MAX_METHOD. This also prevents issuing it with

	 * efx_ioctl_reset.

	 * RESET_TYPE_MAX_METHOD.

	 */

	RESET_TYPE_MCDI_TIMEOUT,

	RESET_TYPE_MAX,