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

Commit 0650c0b8 authored by Yuval Mintz's avatar Yuval Mintz Committed by David S. Miller
Browse files

bnx2x: Fix to prevent inner-reload 



Submit 909d9faa ("bnx2x: Prevent inner-reload while VFs exist")
contained a bug - MTU change was not prevented by it; Instead, it
`randomally' prevented bnx2x_resume() from running [harmless yet wrong].

This moves the check to its correct spot.

Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 73e84313

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+5 −5
Original line number Diff line number Diff line
@@ -4786,6 +4786,11 @@ int bnx2x_change_mtu(struct net_device *dev, int new_mtu) 
{

	struct bnx2x *bp = netdev_priv(dev);



	if (pci_num_vf(bp->pdev)) {

		DP(BNX2X_MSG_IOV, "VFs are enabled, can not change MTU\n");

		return -EPERM;

	}



	if (bp->recovery_state != BNX2X_RECOVERY_DONE) {

		BNX2X_ERR("Can't perform change MTU during parity recovery\n");

		return -EAGAIN;
@@ -4938,11 +4943,6 @@ int bnx2x_resume(struct pci_dev *pdev) 
	}

	bp = netdev_priv(dev);



	if (pci_num_vf(bp->pdev)) {

		DP(BNX2X_MSG_IOV, "VFs are enabled, can not change MTU\n");

		return -EPERM;

	}



	if (bp->recovery_state != BNX2X_RECOVERY_DONE) {

		BNX2X_ERR("Handling parity error recovery. Try again later\n");

		return -EAGAIN;