From: Ron Mercer <ron.mercer@qlogic.com>
Date: Tue, 17 Nov 2009 11:10:40 +0000 (+0000)
Subject: qlge: Bonding fix for mode 6.
X-Git-Tag: firefly_0821_release~11625^2~211
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bf9a88d93ee2cfa44b0cc1ada710e2ef37b5ce0d;p=firefly-linux-kernel-4.4.55.git

qlge: Bonding fix for mode 6.

commit 63ae93a19094d88c8ca62543586b20e3a7ff7637 upstream.

Allow MAC address to be changed even if device is not up.

Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Brandon Philips <bphilips@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index f42ff310ce5d..35d896b049fa 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -3712,9 +3712,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);