rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iwlagn: check for !priv->txq in iwlagn_wait_tx_queue_empty (rhbz 728044)

This commit is contained in:
Dave Jones 2011-08-03 21:51:30 -04:00
parent 2a94216ed5
commit 3205070880
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
iwlagn-check-for-priv--txq-in-iwlagn_wait_tx_queue_empty.patch Normal file
View File

@ -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)

7
kernel.spec
View File

@ -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 <davej@redhat.com>
- iwlagn: check for !priv->txq in iwlagn_wait_tx_queue_empty (rhbz 728044)
* Wed Aug 03 2011 Dave Jones <davej@redhat.com>
- Apply patches from patch-3.0.1-rc1