lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2006-03-06 12:10:42 -08:00
parent 264132bc62 2d66806d74
commit b6f57864ee
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/chelsio/espi.c
View File

@@ -296,9 +296,7 @@ void t1_espi_destroy(struct peespi *espi)
struct peespi *t1_espi_create(adapter_t *adapter) struct peespi *t1_espi_create(adapter_t *adapter)
{ {
struct peespi *espi = kmalloc(sizeof(*espi), GFP_KERNEL); struct peespi *espi = kzalloc(sizeof(*espi), GFP_KERNEL);
memset(espi, 0, sizeof(*espi));
if (espi) if (espi)
espi->adapter = adapter; espi->adapter = adapter;

1
drivers/net/s2io.c
View File

@@ -4092,6 +4092,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;