From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752770Ab1GYTlA (ORCPT ); Mon, 25 Jul 2011 15:41:00 -0400 Received: from mga01.intel.com ([192.55.52.88]:34874 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752478Ab1GYTk4 (ORCPT ); Mon, 25 Jul 2011 15:40:56 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.67,264,1309762800"; d="scan'208";a="32134161" Subject: Re: [PATCH] iwlagn: check for !priv->txq in iwlagn_wait_tx_queue_empty From: wwguy To: Keith Packard Cc: Intel Linux Wireless , "linux-wireless@vger.kernel.org" , "linux-kernel@vger.kernel.org" In-Reply-To: <1311622702-4807-1-git-send-email-keithp@keithp.com> References: <1311622702-4807-1-git-send-email-keithp@keithp.com> Content-Type: text/plain; charset="UTF-8" Date: Mon, 25 Jul 2011 12:36:34 -0700 Message-ID: <1311622594.3431.0.camel@wwguy-ubuntu> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2011-07-25 at 12:38 -0700, Keith Packard wrote: > If the interface is down, txq is NULL. iwlagn_wait_tx_queue_empty > needs to check for this case to avoid dereferencing that pointer. > > Signed-off-by: Keith Packard > --- > > This is on top of v3.0 > > drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c > index f803fb6..d6ae444 100644 > --- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c > +++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c > @@ -1487,6 +1487,9 @@ int iwlagn_wait_tx_queue_empty(struct iwl_priv *priv) > unsigned long now = jiffies; > int ret = 0; > > + if (!priv->txq) > + return 0; > + > /* waiting for all the tx frames complete might take a while */ > for (cnt = 0; cnt < priv->hw_params.max_txq_num; cnt++) { > if (cnt == priv->cmd_queue) is this against any bug in bugzilla? please include the information in description Thanks Wey