From: Tobias Diedrich <ranma+kernel@tdiedrich.de>
Date: Sun, 18 May 2008 13:00:36 +0000 (+0200)
Subject: [netdrvr] forcedeth: Restore multicast settings on resume
X-Git-Tag: v2.6.26-rc4~7^2~1^2~22
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=40ba182e3ca9f019f299ce5052fcd7e4cf68d11b;p=linux-2.6-omap-h63xx.git

[netdrvr] forcedeth: Restore multicast settings on resume

nv_open() resets multicast settings, call nv_set_multicast(dev)
to restore them.  (Maybe this should rather be moved into nv_open())

Signed-off-by: Tobias Diedrich <ranma+kernel@tdiedrich.de>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
---

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 35f66d4a459..9eca97fb0a5 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -5823,6 +5823,7 @@ static int nv_resume(struct pci_dev *pdev)
 	writel(txreg, base + NvRegTransmitPoll);
 
 	rc = nv_open(dev);
+	nv_set_multicast(dev);
 out:
 	return rc;
 }