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

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

Merge branch 'mvneta-fixes' 



Gregory CLEMENT says:

====================
Few mvneta fixes

here it is a small series of fixes found on the mvneta driver. They
had been already used in the vendor kernel and are now ported to
mainline.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d03a4557 2eecb2e0

drivers/net/ethernet/marvell/mvneta.c

+6 −2
Original line number Diff line number Diff line
@@ -1214,6 +1214,10 @@ static void mvneta_port_disable(struct mvneta_port *pp) 
	val &= ~MVNETA_GMAC0_PORT_ENABLE;

	mvreg_write(pp, MVNETA_GMAC_CTRL_0, val);



	pp->link = 0;

	pp->duplex = -1;

	pp->speed = 0;



	udelay(200);

}
@@ -1958,9 +1962,9 @@ static int mvneta_rx_swbm(struct mvneta_port *pp, int rx_todo, 


		if (!mvneta_rxq_desc_is_first_last(rx_status) ||

		    (rx_status & MVNETA_RXD_ERR_SUMMARY)) {

			mvneta_rx_error(pp, rx_desc);

err_drop_frame:

			dev->stats.rx_errors++;

			mvneta_rx_error(pp, rx_desc);

			/* leave the descriptor untouched */

			continue;

		}
@@ -3011,7 +3015,7 @@ static void mvneta_cleanup_rxqs(struct mvneta_port *pp) 
{

	int queue;



	for (queue = 0; queue < txq_number; queue++)

	for (queue = 0; queue < rxq_number; queue++)

		mvneta_rxq_deinit(pp, &pp->rxqs[queue]);

}