---

yaml --- r: 130119 b: refs/heads/master c: 2add3ac h: refs/heads/master i: 130117: 8c542ef 130115: 6a5f4ad 130111: 809068d v: v3
git-mirror · Jan 20, 2009 · 457e547 · 457e547
1 parent 87c1809
commit 457e547
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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,