summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorRon Mercer <ron.mercer@qlogic.com>2009-11-17 11:10:40 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2010-01-28 15:01:48 -0800
commitbf9a88d93ee2cfa44b0cc1ada710e2ef37b5ce0d (patch)
tree15aff3dbe5b545f92dd5c04b76244a3d096e8896 /drivers/net
parent6b076176f9228c25cac5bdc17af8e4c4d2e687ab (diff)
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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/qlge/qlge_main.c3
1 files changed, 0 insertions, 3 deletions
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);