From 0cc0dc339c3d1e49391f0311a52152270424d1d8 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@garzik.org>
Date: Sat, 4 Mar 2006 12:07:07 -0500
Subject: [PATCH] --- yaml --- r: 21277 b: refs/heads/master c:
 fb15b9dd8b3f44290a7b3b06fdfd4be2ad73f0ac h: refs/heads/master i:   21275:
 2653483d0219e1c39b2cdf1479ea11e61f9cd473 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/s2io.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 62ff93529e9a..52c708ccf759 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3cf560e35509634d72cf809074834d5ea23ab66
+refs/heads/master: fb15b9dd8b3f44290a7b3b06fdfd4be2ad73f0ac
diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c
index 99ce70dfe9c8..79208f434ac1 100644
--- a/trunk/drivers/net/s2io.c
+++ b/trunk/drivers/net/s2io.c
@@ -4160,6 +4160,7 @@ static void s2io_set_multicast(struct net_device *dev)
 		     i++, mclist = mclist->next) {
 			memcpy(sp->usr_addrs[i].addr, mclist->dmi_addr,
 			       ETH_ALEN);
+			mac_addr = 0;
 			for (j = 0; j < ETH_ALEN; j++) {
 				mac_addr |= mclist->dmi_addr[j];
 				mac_addr <<= 8;