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

Commit dad3e452 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

[BNX2]: Block MII access when ifdown. 



The device may be in D3hot state and should not allow MII register
access.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 427c2196

drivers/net/bnx2.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -5562,6 +5562,9 @@ bnx2_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
	case SIOCGMIIREG: {

	case SIOCGMIIREG: {

		u32 mii_regval;

		u32 mii_regval;





		if (!netif_running(dev))

			return -EAGAIN;



		spin_lock_bh(&bp->phy_lock);

		spin_lock_bh(&bp->phy_lock);

		err = bnx2_read_phy(bp, data->reg_num & 0x1f, &mii_regval);

		err = bnx2_read_phy(bp, data->reg_num & 0x1f, &mii_regval);

		spin_unlock_bh(&bp->phy_lock);

		spin_unlock_bh(&bp->phy_lock);
@@ -5575,6 +5578,9 @@ bnx2_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
		if (!capable(CAP_NET_ADMIN))

		if (!capable(CAP_NET_ADMIN))

			return -EPERM;

			return -EPERM;





		if (!netif_running(dev))

			return -EAGAIN;



		spin_lock_bh(&bp->phy_lock);

		spin_lock_bh(&bp->phy_lock);

		err = bnx2_write_phy(bp, data->reg_num & 0x1f, data->val_in);

		err = bnx2_write_phy(bp, data->reg_num & 0x1f, data->val_in);

		spin_unlock_bh(&bp->phy_lock);

		spin_unlock_bh(&bp->phy_lock);