[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1311621715.5579.138.camel@wwguy-huron>
Date: Mon, 25 Jul 2011 12:21:55 -0700
From: "Guy, Wey-Yi" <wey-yi.w.guy@...el.com>
To: Keith Packard <keithp@...thp.com>
Cc: Intel Linux Wireless <ilw@...ux.intel.com>,
"linux-wireless@...r.kernel.org" <linux-wireless@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] iwlagn: check for !priv->txq in
iwlagn_wait_tx_queue_empty
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 <keithp@...thp.com>
> ---
>
> 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)
but why you need it?, "start device" call will fail if can not allocate
priv->txq
Thanks
Wey
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists