From 489475168a7df3c1fd22cde3e6eb8dc0307262e6 Mon Sep 17 00:00:00 2001
From: Ron Mercer <ron.mercer@qlogic.com>
Date: Thu, 8 Oct 2009 09:54:42 +0000
Subject: [PATCH] --- yaml --- r: 167525 b: refs/heads/master c:
 2cd6dbaaf43ca9ec5607239c23c4e9793b702e1b h: refs/heads/master i:   167523:
 bc638f393ad7d4eaae1cdb088ba6eb6894d47b2d v: v3

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

diff --git a/[refs] b/[refs]
index 5ddf949134d8..cf0d8977e453 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84087f4d482c5d554e1b26a557d424761213e5dc
+refs/heads/master: 2cd6dbaaf43ca9ec5607239c23c4e9793b702e1b
diff --git a/trunk/drivers/net/qlge/qlge_main.c b/trunk/drivers/net/qlge/qlge_main.c
index fe13006b4249..48b45df85ec9 100644
--- a/trunk/drivers/net/qlge/qlge_main.c
+++ b/trunk/drivers/net/qlge/qlge_main.c
@@ -3751,6 +3751,12 @@ static void ql_asic_reset_work(struct work_struct *work)
 	status = ql_adapter_up(qdev);
 	if (status)
 		goto error;
+
+	/* Restore rx mode. */
+	clear_bit(QL_ALLMULTI, &qdev->flags);
+	clear_bit(QL_PROMISCUOUS, &qdev->flags);
+	qlge_set_multicast_list(qdev->ndev);
+
 	rtnl_unlock();
 	return;
 error: