From: Ron Mercer <ron.mercer@qlogic.com>
Date: Thu, 8 Oct 2009 09:54:42 +0000 (+0000)
Subject: qlge: Restore rx mode after internal reset.
X-Git-Tag: v2.6.32-rc5~13^2~26
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2cd6dbaaf43ca9ec5607239c23c4e9793b702e1b;p=users%2Fjedix%2Flinux-maple.git

qlge: Restore rx mode after internal reset.

Call set_multi API after reset recovery.  This was exposed by tripping
tx_timeout.

Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index fe13006b4249..48b45df85ec9 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/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: