Merge branch 'upstream-fixes'

fb15b9dd · Jeff Garzik · c3cf560e · a7a80d5a · fb15b9dd
隐藏空白更改
内联并排

Showing with 1 addition and 0 deletion

drivers/net/s2io.c drivers/net/s2io.c +1 -0

未找到文件。
--- 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;