From e05164e09a1679b7762a8f15b8a924728d15f8f8 Mon Sep 17 00:00:00 2001
From: Ron Mercer <ron.mercer@qlogic.com>
Date: Tue, 17 Nov 2009 11:10:40 +0000
Subject: [PATCH] --- yaml --- r: 171615 b: refs/heads/master c:
 63ae93a19094d88c8ca62543586b20e3a7ff7637 h: refs/heads/master i:   171613:
 877bee879238258a87d465e40daa13418e9dd076   171611:
 bb0b658df1a903858f6f534bfad1a43a21d3a717   171607:
 2ec250d00c6d1692e7f4a008655a5e3e842d4d18   171599:
 b651e1eb8505041278f7b3b2ca0ca0ed161314dc   171583:
 a77d38c2d9ba077515ca2bdd3a1b1e1aa87b0a87 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/qlge/qlge_main.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b7f1c300d9c0..3d8730bc2a1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f99189b186f3922ede4fa33c02f6edc735b8c981
+refs/heads/master: 63ae93a19094d88c8ca62543586b20e3a7ff7637
diff --git a/trunk/drivers/net/qlge/qlge_main.c b/trunk/drivers/net/qlge/qlge_main.c
index e2ee47d9bca5..7692299e7826 100644
--- a/trunk/drivers/net/qlge/qlge_main.c
+++ b/trunk/drivers/net/qlge/qlge_main.c
@@ -3951,9 +3951,6 @@ static int qlge_set_mac_address(struct net_device *ndev, void *p)
 	struct sockaddr *addr = p;
 	int status;
 
-	if (netif_running(ndev))
-		return -EBUSY;
-
 	if (!is_valid_ether_addr(addr->sa_data))
 		return -EADDRNOTAVAIL;
 	memcpy(ndev->dev_addr, addr->sa_data, ndev->addr_len);