From 2ce606cdf8fb8176fa11010448787de512e4a370 Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Thu, 3 May 2007 13:18:03 -0700
Subject: [PATCH] --- yaml --- r: 53475 b: refs/heads/master c:
 dad3e452dacd3c6c637e2f7c6469556cc8ffcd94 h: refs/heads/master i:   53473:
 89f026f8987b51d0d65ba7c9b7550dce341ca9ad   53471:
 41e6b329836326193e084ae79eab50e105fc284d v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/bnx2.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c571cc02cdc8..834814fba3d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 427c2196b92697a4a8ee87959ebc16bfac024f6b
+refs/heads/master: dad3e452dacd3c6c637e2f7c6469556cc8ffcd94
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
index f98a2205a090..9f0a06722e23 100644
--- a/trunk/drivers/net/bnx2.c
+++ b/trunk/drivers/net/bnx2.c
@@ -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);