From: Eilon Greenstein Date: Wed, 14 Jan 2009 06:44:07 +0000 (+0000) Subject: bnx2x: Block nvram access when the device is inactive X-Git-Tag: v2.6.29-rc3~23^2~73 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2add3acb11a26cc14b54669433ae6ace6406cbf2;p=linux-2.6-omap-h63xx.git bnx2x: Block nvram access when the device is inactive 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 Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller --- diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c index 7ee6a211f9b..ca5090c3341 100644 --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x_main.c @@ -8107,6 +8107,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,