Return-path: Received: from mail.atheros.com ([12.19.149.2]:16628 "EHLO mail.atheros.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751729Ab1C2HmQ (ORCPT ); Tue, 29 Mar 2011 03:42:16 -0400 Received: from mail.atheros.com ([10.10.20.105]) by sidewinder.atheros.com for ; Tue, 29 Mar 2011 00:41:52 -0700 Message-ID: <4D918D48.9040809@atheros.com> Date: Tue, 29 Mar 2011 13:12:00 +0530 From: Mohammed Shafi MIME-Version: 1.0 To: Luis Rodriguez CC: "linux-wireless@vger.kernel.org" Subject: Re: [PATCH 9/9] ath9k: Fix memory leak due to failed PAPRD frames References: <1301345835-11401-1-git-send-email-lrodriguez@atheros.com> <1301345835-11401-10-git-send-email-lrodriguez@atheros.com> In-Reply-To: <1301345835-11401-10-git-send-email-lrodriguez@atheros.com> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Sender: linux-wireless-owner@vger.kernel.org List-ID: On Tuesday 29 March 2011 02:27 AM, Luis Rodriguez wrote: > From: Mohammed Shafi Shajakhan > > commit 479600777bb588724d044815415f7d708d06644b upstream > > free the skb's when the Tx of PAPRD frames fails and also add a debug > message indicating that. > > Signed-off-by: Mohammed Shafi Shajakhan > Cc: stable@kernel.org > Signed-off-by: John W. Linville > --- > drivers/net/wireless/ath/ath9k/main.c | 5 ++++- > 1 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c > index 1049313..16b8e36 100644 > --- a/drivers/net/wireless/ath/ath9k/main.c > +++ b/drivers/net/wireless/ath/ath9k/main.c > @@ -384,8 +384,11 @@ void ath_paprd_calibrate(struct work_struct *work) > init_completion(&sc->paprd_complete); > ar9003_paprd_setup_gain_table(ah, chain); > txctl.paprd = BIT(chain); > - if (ath_tx_start(hw, skb,&txctl) != 0) > + if (ath_tx_start(hw, skb,&txctl) != 0) { > + ath_print(common, ATH_DBG_XMIT, "PAPRD TX failed\n"); > + dev_kfree_skb_any(skb); > break; > + } > > time_left = wait_for_completion_timeout(&sc->paprd_complete, > msecs_to_jiffies(ATH_PAPRD_TIMEOUT)); > Luis, thanks!