Commit aba84871 authored Dec 02, 2020 by Zhang Changzhong Committed by Jakub Kicinski Dec 02, 2020

net: pasemi: fix error return code in pasemi_mac_open()



Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Fixes: 72b05b99 ("pasemi_mac: RX/TX ring management cleanup")
Fixes: 8d636d8b ("pasemi_mac: jumbo frame support")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
Link: https://lore.kernel.org/r/1606903035-1838-1-git-send-email-zhangchangzhong@huawei.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parent ff992489

drivers/net/ethernet/pasemi/pasemi_mac.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -1078,17 +1078,21 @@ static int pasemi_mac_open(struct net_device *dev)

		mac->tx = pasemi_mac_setup_tx_resources(dev);

		if (!mac->tx)
		if (!mac->tx) {
		ret = -ENOMEM;
		goto out_tx_ring;
		}

		/* We might already have allocated rings in case mtu was changed
		* before interface was brought up.
		*/
		if (dev->mtu > 1500 && !mac->num_cs) {
		pasemi_mac_setup_csrings(mac);
		if (!mac->num_cs)
		if (!mac->num_cs) {
		ret = -ENOMEM;
		goto out_tx_ring;
		}
		}

		/* Zero out rmon counters */
		for (i = 0; i < 32; i++)