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

Commit a92dbd96 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by David S. Miller
Browse files

net: mvneta: Check tx queue setup error in mvneta_change_mtu() 



This commit checks the return code of mvneta_setup_txq() call
in mvneta_change_mtu(). Also, use the netdevice pointer directly
instead of dereferencing the port structure. While here, let's
fix a tiny comment typo.

Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3d4ea02f

drivers/net/ethernet/marvell/mvneta.c

+8 −4
Original line number Diff line number Diff line
@@ -2425,24 +2425,28 @@ static int mvneta_change_mtu(struct net_device *dev, int mtu) 
		return 0;



	/* The interface is running, so we have to force a

	 * reallocation of the RXQs

	 * reallocation of the queues

	 */

	mvneta_stop_dev(pp);



	mvneta_cleanup_txqs(pp);

	mvneta_cleanup_rxqs(pp);



	pp->pkt_size = MVNETA_RX_PKT_SIZE(pp->dev->mtu);

	pp->pkt_size = MVNETA_RX_PKT_SIZE(dev->mtu);

	pp->frag_size = SKB_DATA_ALIGN(MVNETA_RX_BUF_SIZE(pp->pkt_size)) +

	                SKB_DATA_ALIGN(sizeof(struct skb_shared_info));



	ret = mvneta_setup_rxqs(pp);

	if (ret) {

		netdev_err(pp->dev, "unable to setup rxqs after MTU change\n");

		netdev_err(dev, "unable to setup rxqs after MTU change\n");

		return ret;

	}



	mvneta_setup_txqs(pp);

	ret = mvneta_setup_txqs(pp);

	if (ret) {

		netdev_err(dev, "unable to setup txqs after MTU change\n");

		return ret;

	}



	mvneta_start_dev(pp);

	mvneta_port_up(pp);