[PATCH] mac80211: cleanup kmalloc/memset -> kcalloc

[PATCH] mac80211: cleanup kmalloc/memset -> kcalloc

[Wei Yongjun]

Transform calls kmalloc/memset to a single kcalloc.

Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
---
 net/mac80211/ht.c               |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
index 5f510a1..743d530 100644
--- a/net/mac80211/ht.c
+++ b/net/mac80211/ht.c
@@ -949,7 +949,7 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
 
 	/* prepare reordering buffer */
 	tid_agg_rx->reorder_buf =
-		kmalloc(buf_size * sizeof(struct sk_buff *), GFP_ATOMIC);
+		kcalloc(buf_size, sizeof(struct sk_buff *), GFP_ATOMIC);
 	if (!tid_agg_rx->reorder_buf) {
 #ifdef CONFIG_MAC80211_HT_DEBUG
 		if (net_ratelimit())
@@ -959,8 +959,6 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
 		kfree(sta->ampdu_mlme.tid_rx[tid]);
 		goto end;
 	}
-	memset(tid_agg_rx->reorder_buf, 0,
-		buf_size * sizeof(struct sk_buff *));
 
 	if (local->ops->ampdu_action)
 		ret = local->ops->ampdu_action(hw, IEEE80211_AMPDU_RX_START,
-- 
1.6.0.3

Re: [PATCH] mac80211: cleanup kmalloc/memset -> kcalloc

[David Miller]

From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Thu, 15 Jan 2009 17:41:16 +0800

> Transform calls kmalloc/memset to a single kcalloc.
> 
> Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>

Wireless, thus this goes to linux-wireless and John
Linville, CC:'d

> diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
> index 5f510a1..743d530 100644
> --- a/net/mac80211/ht.c
> +++ b/net/mac80211/ht.c
> @@ -949,7 +949,7 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
>  
>  	/* prepare reordering buffer */
>  	tid_agg_rx->reorder_buf =
> -		kmalloc(buf_size * sizeof(struct sk_buff *), GFP_ATOMIC);
> +		kcalloc(buf_size, sizeof(struct sk_buff *), GFP_ATOMIC);
>  	if (!tid_agg_rx->reorder_buf) {
>  #ifdef CONFIG_MAC80211_HT_DEBUG
>  		if (net_ratelimit())
> @@ -959,8 +959,6 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
>  		kfree(sta->ampdu_mlme.tid_rx[tid]);
>  		goto end;
>  	}
> -	memset(tid_agg_rx->reorder_buf, 0,
> -		buf_size * sizeof(struct sk_buff *));
>  
>  	if (local->ops->ampdu_action)
>  		ret = local->ops->ampdu_action(hw, IEEE80211_AMPDU_RX_START,
> -- 
> 1.6.0.3
> 
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html