2014-06-14 11:49:22

by Vitaly Osipov

Subject: [PATCH 2/2] staging: rtl8712: use kcalloc instead of kmalloc(x*y,...)

Replaced kmalloc(x*y, ...) with kcalloc(x,y,...)

Signed-off-by: Vitaly Osipov <[email protected]>
---
drivers/staging/rtl8712/rtl871x_mlme.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index 26b8f37..8561841 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -62,8 +62,7 @@ static sint _init_mlme_priv(struct _adapter *padapter)
_init_queue(&(pmlmepriv->scanned_queue));
set_scanned_network_val(pmlmepriv, 0);
memset(&pmlmepriv->assoc_ssid, 0, sizeof(struct ndis_802_11_ssid));
- pbuf = kmalloc(MAX_BSS_CNT * (sizeof(struct wlan_network)),
- GFP_ATOMIC);
+ pbuf = kcalloc(MAX_BSS_CNT, sizeof(struct wlan_network), GFP_ATOMIC);
if (pbuf == NULL)
return _FAIL;
pmlmepriv->free_bss_buf = pbuf;
--
1.9.1

2014-06-14 14:15:32

by Jonas Gorski

Subject: Re: [PATCH 2/2] staging: rtl8712: use kcalloc instead of kmalloc(x*y, ...)

On Sat, Jun 14, 2014 at 1:48 PM, Vitaly Osipov <[email protected]> wrote:
> Replaced kmalloc(x*y, ...) with kcalloc(x,y,...)
>
> Signed-off-by: Vitaly Osipov <[email protected]>
> ---
> drivers/staging/rtl8712/rtl871x_mlme.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
> index 26b8f37..8561841 100644
> --- a/drivers/staging/rtl8712/rtl871x_mlme.c
> +++ b/drivers/staging/rtl8712/rtl871x_mlme.c
> @@ -62,8 +62,7 @@ static sint _init_mlme_priv(struct _adapter *padapter)
> _init_queue(&(pmlmepriv->scanned_queue));
> set_scanned_network_val(pmlmepriv, 0);
> memset(&pmlmepriv->assoc_ssid, 0, sizeof(struct ndis_802_11_ssid));
> - pbuf = kmalloc(MAX_BSS_CNT * (sizeof(struct wlan_network)),
> - GFP_ATOMIC);
> + pbuf = kcalloc(MAX_BSS_CNT, sizeof(struct wlan_network), GFP_ATOMIC);

kcalloc() additionally zeroes the memory, so this is a change in
behaviour. A better replacement would be kmalloc_array().


Jonas