From 0bccd1078fd2f1258aa69753f3e0a53eb8c84d7a Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Wed, 23 Jan 2008 19:11:51 -0800
Subject: [PATCH] --- yaml --- r: 82684 b: refs/heads/master c:
 a7bffe722c996679b4fb2103ecaf673ec2b9b4a7 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/sky2.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7c08fca14054..4c3a180b37d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44911bfee4a92f7580cb4dbba36e986003b0ac75
+refs/heads/master: a7bffe722c996679b4fb2103ecaf673ec2b9b4a7
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index 626190eb91e7..6675b2256cdb 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/drivers/net/sky2.c
@@ -1422,6 +1422,7 @@ static int sky2_up(struct net_device *dev)
 	imask |= portirq_msk[port];
 	sky2_write32(hw, B0_IMSK, imask);
 
+	sky2_set_multicast(dev);
 	return 0;
 
 err_out:
@@ -3554,8 +3555,6 @@ static int sky2_set_ringparam(struct net_device *dev,
 		err = sky2_up(dev);
 		if (err)
 			dev_close(dev);
-		else
-			sky2_set_multicast(dev);
 	}
 
 	return err;
@@ -4389,8 +4388,6 @@ static int sky2_resume(struct pci_dev *pdev)
 				dev_close(dev);
 				goto out;
 			}
-
-			sky2_set_multicast(dev);
 		}
 	}