]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
bnx2x: Block nvram access when the device is inactive
authorEilon Greenstein <eilong@broadcom.com>
Wed, 14 Jan 2009 06:44:07 +0000 (06:44 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 2 Feb 2009 17:53:23 +0000 (09:53 -0800)
commit 2add3acb11a26cc14b54669433ae6ace6406cbf2 upstream.

Don't dump eeprom when bnx2x adapter is down.  Running ethtool -e causes an eeh
without it when the device is down

Signed-off-by: Paul Larson <pl@linux.vnet.ibm.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/net/bnx2x_main.c

index 600210d7eff95da4f60840b530f149cec8259e45..d672d40683b78d317cbce58841c7e9ac9a62f4b0 100644 (file)
@@ -8079,6 +8079,9 @@ static int bnx2x_get_eeprom(struct net_device *dev,
        struct bnx2x *bp = netdev_priv(dev);
        int rc;
 
+       if (!netif_running(dev))
+               return -EAGAIN;
+
        DP(BNX2X_MSG_NVM, "ethtool_eeprom: cmd %d\n"
           DP_LEVEL "  magic 0x%x  offset 0x%x (%d)  len 0x%x (%d)\n",
           eeprom->cmd, eeprom->magic, eeprom->offset, eeprom->offset,