| commit | fb15b9dd8b3f44290a7b3b06fdfd4be2ad73f0ac | [log] [tgz] |
|---|---|---|
| author | Jeff Garzik <jeff@garzik.org> | Sat Mar 04 12:07:07 2006 -0500 |
| committer | Jeff Garzik <jeff@garzik.org> | Sat Mar 04 12:07:07 2006 -0500 |
| tree | cab2d85fb0ebfa33ee20e5738e11f58c0b1e16cd | |
| parent | c3cf560e35509634d72cf809074834d5ea23ab66 [diff] | |
| parent | a7a80d5ad3735554338199b9d976dfda5c10d3c7 [diff] |
Merge branch 'upstream-fixes'
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 99ce70d..79208f4 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c
@@ -4160,6 +4160,7 @@ 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;