Merge branch 'upstream-fixes'

2006-03-04 12:07:07 -05:00 · 2006-03-04 12:07:07 -05:00 · fb15b9dd8b
parent c3cf560e35 a7a80d5ad3
commit fb15b9dd8b
1 changed files with 1 additions and 0 deletions
--- a/drivers/net/s2io.c
+++ b/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;