aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/forcedeth.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-05-23 00:05:14 -0700
committerDavid S. Miller <davem@davemloft.net>2008-05-23 00:05:14 -0700
commit7bece8155be133cd67c41eed2b31c60a310609de (patch)
tree906a62dcf10c1f2e6c1188a2b6e386668fcd9fe3 /drivers/net/forcedeth.c
parentnetlink: Fix nla_parse_nested_compat() to call nla_parse() directly (diff)
parentfmvj18x_cs: add NextCom NC5310 rev B support (diff)
downloadlinux-dev-7bece8155be133cd67c41eed2b31c60a310609de.tar.xz
linux-dev-7bece8155be133cd67c41eed2b31c60a310609de.zip
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/forcedeth.c')
-rw-r--r--drivers/net/forcedeth.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 35f66d4a4595..9eca97fb0a54 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;
}