Merge branch 'master'

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 49b597cbc19a076e1ed2e737ff68b7b653922044..b7f00d6eb6a6a49bd3b34f4729806cf77d867702 100644 (file)
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -4092,6 +4092,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;