---

yaml --- r: 82684 b: refs/heads/master c: a7bffe7 h: refs/heads/master v: v3
git-mirror · Feb 3, 2008 · 0bccd10 · 0bccd10
1 parent aae738a
commit 0bccd10
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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);
 		}
 	}