Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb15b9dd authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream-fixes'

parents c3cf560e a7a80d5a

drivers/net/s2io.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -4160,6 +4160,7 @@ static void s2io_set_multicast(struct net_device *dev) 
		     i++, mclist = mclist->next) {

		     i++, mclist = mclist->next) {

			memcpy(sp->usr_addrs[i].addr, mclist->dmi_addr,

			memcpy(sp->usr_addrs[i].addr, mclist->dmi_addr,

			       ETH_ALEN);

			       ETH_ALEN);

			mac_addr = 0;

			for (j = 0; j < ETH_ALEN; j++) {

			for (j = 0; j < ETH_ALEN; j++) {

				mac_addr |= mclist->dmi_addr[j];

				mac_addr |= mclist->dmi_addr[j];

				mac_addr <<= 8;

				mac_addr <<= 8;