From patchwork Thu Jan 15 09:41:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 18619 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 05ECADE024 for ; Thu, 15 Jan 2009 20:41:03 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755067AbZAOJk7 (ORCPT ); Thu, 15 Jan 2009 04:40:59 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754794AbZAOJk6 (ORCPT ); Thu, 15 Jan 2009 04:40:58 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:64382 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752537AbZAOJk4 (ORCPT ); Thu, 15 Jan 2009 04:40:56 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 9FF60170154; Thu, 15 Jan 2009 18:06:16 +0800 (CST) Received: from fnst.cn.fujitsu.com (localhost.localdomain [127.0.0.1]) by tang.cn.fujitsu.com (8.13.1/8.13.1) with ESMTP id n0F9euB6003629; Thu, 15 Jan 2009 17:40:57 +0800 Received: from [10.167.141.76] (unknown [10.167.141.76]) by fnst.cn.fujitsu.com (Postfix) with ESMTP id 58D77D4409; Thu, 15 Jan 2009 17:40:42 +0800 (CST) Message-ID: <496F04BC.3030703@cn.fujitsu.com> Date: Thu, 15 Jan 2009 17:41:16 +0800 From: Wei Yongjun User-Agent: Thunderbird 2.0.0.6 (Windows/20070728) MIME-Version: 1.0 To: David Miller CC: netdev@vger.kernel.org Subject: [PATCH] mac80211: cleanup kmalloc/memset -> kcalloc Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Transform calls kmalloc/memset to a single kcalloc. Signed-off-by: Wei Yongjun --- 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,