From 320507088097cfdefc2952bfd206b9cb9a10fdac Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Wed, 3 Aug 2011 21:51:30 -0400 Subject: [PATCH] iwlagn: check for !priv->txq in iwlagn_wait_tx_queue_empty (rhbz 728044) --- ...r-priv--txq-in-iwlagn_wait_tx_queue_empty.patch | 14 ++++++++++++++ kernel.spec | 7 +++++++ 2 files changed, 21 insertions(+) create mode 100644 iwlagn-check-for-priv--txq-in-iwlagn_wait_tx_queue_empty.patch diff --git a/iwlagn-check-for-priv--txq-in-iwlagn_wait_tx_queue_empty.patch b/iwlagn-check-for-priv--txq-in-iwlagn_wait_tx_queue_empty.patch new file mode 100644 index 000000000..855a30da7 --- /dev/null +++ b/iwlagn-check-for-priv--txq-in-iwlagn_wait_tx_queue_empty.patch @@ -0,0 +1,14 @@ +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) diff --git a/kernel.spec b/kernel.spec index 6d4019aa9..b2fd2acb5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -655,6 +655,8 @@ Patch12303: dmar-disable-when-ricoh-multifunction.patch Patch13001: epoll-fix-spurious-lockdep-warnings.patch Patch13002: hfsplus-ensure-bio-requests-are-not-smaller-than-the.patch +Patch13010: iwlagn-check-for-priv--txq-in-iwlagn_wait_tx_queue_empty.patch + Patch20000: utrace.patch %endif @@ -1207,6 +1209,8 @@ ApplyPatch epoll-fix-spurious-lockdep-warnings.patch ApplyPatch hfsplus-ensure-bio-requests-are-not-smaller-than-the.patch +ApplyPatch iwlagn-check-for-priv--txq-in-iwlagn_wait_tx_queue_empty.patch + ApplyPatch utrace.patch # END OF PATCH APPLICATIONS @@ -1821,6 +1825,9 @@ fi # and build. %changelog +* Wed Aug 03 2011 Dave Jones +- iwlagn: check for !priv->txq in iwlagn_wait_tx_queue_empty (rhbz 728044) + * Wed Aug 03 2011 Dave Jones - Apply patches from patch-3.0.1-rc1