Commit b6f57864 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 

* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  [PATCH] chelsio: fix kmalloc failure in t1_espi_create
  Merge branch 'master'
  s2io: set_multicast_list bug
parents 264132bc 2d66806d

drivers/net/chelsio/espi.c

+1 −3
Original line number Diff line number Diff line
@@ -296,9 +296,7 @@ void t1_espi_destroy(struct peespi *espi) 


struct peespi *t1_espi_create(adapter_t *adapter)

{

	struct peespi *espi = kmalloc(sizeof(*espi), GFP_KERNEL);



	memset(espi, 0, sizeof(*espi));

	struct peespi *espi = kzalloc(sizeof(*espi), GFP_KERNEL);



	if (espi)

		espi->adapter = adapter;

drivers/net/s2io.c

+1 −0
Original line number Diff line number Diff line
@@ -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;