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

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

Merge branch 'sfc-defalconisation-fixups' 



Edward Cree says:

====================
sfc: defalconisation fixups

A bug fix, the Kconfig change, and cleaning up a bit more unused code.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2934c9db 99831b1e

drivers/net/ethernet/sfc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ config SFC 
	select I2C

	select I2C_ALGOBIT

	select PTP_1588_CLOCK

	select SFC_FALCON

	---help---

	  This driver supports 10/40-gigabit Ethernet cards based on

	  the Solarflare SFC9000-family and SFC9100-family controllers.

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,

drivers/net/ethernet/sfc/farch.c

+1 −1
Original line number Diff line number Diff line
@@ -913,7 +913,7 @@ static u16 efx_farch_handle_rx_not_ok(struct efx_rx_queue *rx_queue, 
	if (rx_ev_other_err && net_ratelimit()) {

		netif_dbg(efx, rx_err, efx->net_dev,

			  " RX queue %d unexpected RX event "

			  EFX_QWORD_FMT "%s%s%s%s%s%s%s%s\n",

			  EFX_QWORD_FMT "%s%s%s%s%s%s%s\n",

			  efx_rx_queue_index(rx_queue), EFX_QWORD_VAL(*event),

			  rx_ev_buf_owner_id_err ? " [OWNER_ID_ERR]" : "",

			  rx_ev_ip_hdr_chksum_err ?