diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-06 12:10:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-06 12:10:42 -0800 |
| commit | b6f57864eeacd556013c4b40917d50d7c8c38f8c (patch) | |
| tree | f06af675059a506bfb0b70489796f97f13214a2f | |
| parent | 264132bc62fe071d0ff378c1103bae9d33212f10 (diff) | |
| parent | 2d66806d740eeb410aa785bd7fba3bd24bb082c1 (diff) | |
| download | linux-3.10-b6f57864eeacd556013c4b40917d50d7c8c38f8c.tar.gz linux-3.10-b6f57864eeacd556013c4b40917d50d7c8c38f8c.tar.bz2 linux-3.10-b6f57864eeacd556013c4b40917d50d7c8c38f8c.zip | |
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
| -rw-r--r-- | drivers/net/chelsio/espi.c | 4 | ||||
| -rw-r--r-- | drivers/net/s2io.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/chelsio/espi.c b/drivers/net/chelsio/espi.c index 230642571c9..e824acaf188 100644 --- a/drivers/net/chelsio/espi.c +++ b/drivers/net/chelsio/espi.c @@ -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; diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 49b597cbc19..b7f00d6eb6a 100644 --- 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; |