From 457e54770ae651e4e453012067fe2e29e3612bd7 Mon Sep 17 00:00:00 2001 From: Eilon Greenstein Date: Wed, 14 Jan 2009 06:44:07 +0000 Subject: [PATCH] --- yaml --- r: 130119 b: refs/heads/master c: 2add3acb11a26cc14b54669433ae6ace6406cbf2 h: refs/heads/master i: 130117: 8c542ef52cee8f3341f7f5885dcab4b14312812f 130115: 6a5f4addf4e6beed6ec4e0d8cf911f94e7dba832 130111: 809068d987f6ae5054811660b3dd20aef2588557 v: v3 --- [refs] | 2 +- trunk/drivers/net/bnx2x_main.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 069148b9ac64..1bef5f492e48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a40e08e666e8caa1227333de41fd1e2cd84d4f5 +refs/heads/master: 2add3acb11a26cc14b54669433ae6ace6406cbf2 diff --git a/trunk/drivers/net/bnx2x_main.c b/trunk/drivers/net/bnx2x_main.c index 7ee6a211f9ba..ca5090c3341e 100644 --- a/trunk/drivers/net/bnx2x_main.c +++ b/trunk/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,