]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
[BNX2]: Block MII access when ifdown.
authorMichael Chan <mchan@broadcom.com>
Thu, 3 May 2007 20:18:03 +0000 (13:18 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 3 May 2007 20:18:03 +0000 (13:18 -0700)
The device may be in D3hot state and should not allow MII register
access.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bnx2.c

index f98a2205a09035cc0741ea049eed5615fd873cdf..9f0a06722e236998d23a4e1daf8cfef682b0e159 100644 (file)
@@ -5562,6 +5562,9 @@ bnx2_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
        case SIOCGMIIREG: {
                u32 mii_regval;
 
+               if (!netif_running(dev))
+                       return -EAGAIN;
+
                spin_lock_bh(&bp->phy_lock);
                err = bnx2_read_phy(bp, data->reg_num & 0x1f, &mii_regval);
                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))
                        return -EPERM;
 
+               if (!netif_running(dev))
+                       return -EAGAIN;
+
                spin_lock_bh(&bp->phy_lock);
                err = bnx2_write_phy(bp, data->reg_num & 0x1f, data->val_in);
                spin_unlock_bh(&bp->phy_lock);