Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a7bffe722c996679b4fb2103ecaf673ec2b9b4a7
Commit: a7bffe722c996679b4fb2103ecaf673ec2b9b4a7
Parent: 44911bfee4a92f7580cb4dbba36e986003b0ac75
Author: Stephen Hemminger <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 23 19:11:51 2008 -0800
Committer: David S. Miller <[EMAIL PROTECTED]>
CommitDate: Sun Feb 3 04:28:44 2008 -0800
sky2: restore multicast addresses after recovery
If the sky2 deadman timer forces a recovery, the multicast hash
list is lost. Move the call to sky2_set_multicast to the end
of sky2_up() so all paths that bring device up will restore multicast.
Signed-off-by: Stephen Hemminger <[EMAIL PROTECTED]>
Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
drivers/net/sky2.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 626190e..6675b22 100644
--- a/drivers/net/sky2.c
+++ b/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);
}
}
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
