diff options
author | Rasmus Villemoes <linux@rasmusvillemoes.dk> | 2015-09-09 04:38:04 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-09-09 20:06:00 -0400 |
commit | b66a60857ca4fae5900c5d81c2ba04e657509b99 (patch) | |
tree | 2d7cff3ca80f8b257ba1b8687326c827eb14cc61 /drivers/net/ethernet/marvell/mv643xx_eth.c | |
parent | e9b5ac277e8f8dffa28f85a065e2fd890d9e48c7 (diff) |
net: mv643xx_eth: use kzalloc
The double memset is a little ugly; using kzalloc avoids it altogether.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell/mv643xx_eth.c')
-rw-r--r-- | drivers/net/ethernet/marvell/mv643xx_eth.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index d52639bc491f..960169efe636 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c | |||
@@ -1859,14 +1859,11 @@ oom: | |||
1859 | return; | 1859 | return; |
1860 | } | 1860 | } |
1861 | 1861 | ||
1862 | mc_spec = kmalloc(0x200, GFP_ATOMIC); | 1862 | mc_spec = kzalloc(0x200, GFP_ATOMIC); |
1863 | if (mc_spec == NULL) | 1863 | if (mc_spec == NULL) |
1864 | goto oom; | 1864 | goto oom; |
1865 | mc_other = mc_spec + (0x100 >> 2); | 1865 | mc_other = mc_spec + (0x100 >> 2); |
1866 | 1866 | ||
1867 | memset(mc_spec, 0, 0x100); | ||
1868 | memset(mc_other, 0, 0x100); | ||
1869 | |||
1870 | netdev_for_each_mc_addr(ha, dev) { | 1867 | netdev_for_each_mc_addr(ha, dev) { |
1871 | u8 *a = ha->addr; | 1868 | u8 *a = ha->addr; |
1872 | u32 *table; | 1869 | u32 *table; |