From 7050916c3d005e4cf0525a2d0617e3bbe5917077 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Thu, 15 Jan 2009 17:41:16 +0800 Subject: [PATCH] --- yaml --- r: 134172 b: refs/heads/master c: e9648179706448d50884f172711b00a6e5ab9e42 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/ht.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 36c405f71511..4714352ee79e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 672cf3cefe5f686637dec72b9f3d21fe1cdc8c94 +refs/heads/master: e9648179706448d50884f172711b00a6e5ab9e42 diff --git a/trunk/net/mac80211/ht.c b/trunk/net/mac80211/ht.c index 6be485264236..7a38d2e76ca9 100644 --- a/trunk/net/mac80211/ht.c +++ b/trunk/net/mac80211/ht.c @@ -950,7 +950,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()) @@ -960,8 +960,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,