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

Merge branch 'atlantic-bugfixes' 



Igor Russkikh says:

====================
Aquantia/Marvell atlantic bugfixes 2020/01

Here is a set of recently discovered bugfixes,
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4012a6f2 b585f860

drivers/net/ethernet/aquantia/atlantic/aq_nic.c

+2 −2
Original line number Diff line number Diff line
@@ -403,6 +403,8 @@ int aq_nic_start(struct aq_nic_s *self) 
	if (err < 0)

		goto err_exit;



	aq_nic_set_loopback(self);



	err = self->aq_hw_ops->hw_start(self->aq_hw);

	if (err < 0)

		goto err_exit;
@@ -413,8 +415,6 @@ int aq_nic_start(struct aq_nic_s *self) 


	INIT_WORK(&self->service_task, aq_nic_service_task);



	aq_nic_set_loopback(self);



	timer_setup(&self->service_timer, aq_nic_service_timer_cb, 0);

	aq_nic_service_timer_cb(&self->service_timer);

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c

+0 −3
Original line number Diff line number Diff line
@@ -1525,9 +1525,6 @@ const struct aq_hw_ops hw_atl_ops_b0 = { 
	.rx_extract_ts           = hw_atl_b0_rx_extract_ts,

	.extract_hwts            = hw_atl_b0_extract_hwts,

	.hw_set_offload          = hw_atl_b0_hw_offload_set,

	.hw_get_hw_stats         = hw_atl_utils_get_hw_stats,

	.hw_get_fw_version       = hw_atl_utils_get_fw_version,

	.hw_set_offload          = hw_atl_b0_hw_offload_set,

	.hw_set_loopback         = hw_atl_b0_set_loopback,

	.hw_set_fc               = hw_atl_b0_set_fc,

};

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c

+1 −3
Original line number Diff line number Diff line
@@ -667,9 +667,7 @@ int hw_atl_utils_mpi_get_link_status(struct aq_hw_s *self) 
	u32 speed;



	mpi_state = hw_atl_utils_mpi_get_state(self);

	speed = mpi_state & (FW2X_RATE_100M | FW2X_RATE_1G |

			     FW2X_RATE_2G5 | FW2X_RATE_5G |

			     FW2X_RATE_10G);

	speed = mpi_state >> HW_ATL_MPI_SPEED_SHIFT;



	if (!speed) {

		link_status->mbps = 0U;

CRA Git | Maintained and supported by SUSTech CRA and CCSE