[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <Pine.LNX.4.64.1004090104570.7829@boston.corp.fedex.com>
Date: Fri, 9 Apr 2010 01:16:43 +0800 (SGT)
From: Jeff Chua <jeff.chua.linux@...il.com>
To: Linus Torvalds <torvalds@...ux-foundation.org>,
Wey-Yi Guy <wey-yi.w.guy@...el.com>,
Shanyu Zhao <shanyu.zhao@...el.com>,
Reinette Chatre <reinette.chatre@...el.com>
cc: stable@...nel.org, Linux Kernel <linux-kernel@...r.kernel.org>
Subject: [REVERT] be6b38bcb175613f239e0b302607db346472c6b6. v2.6.34-rc3-406
oops with 4965AGN wireless
Linus,
I'm having problem with the latest git pull 2 days ago with the 4965AGN
wireless.
Starting the wireless with WPA2 resulted in system hard freeze. Reverting
the commit below solves the problem.
Thanks,
Jeff
commit be6b38bcb175613f239e0b302607db346472c6b6
Author: Wey-Yi Guy <wey-yi.w.guy@...el.com>
Date: Thu Mar 18 09:05:00 2010 -0700
iwlwifi: counting number of tfds can be free for 4965
Forget one hunk in 4965 during "iwlwifi: error checking for number of tfds
in queue" patch.
Reported-by: Shanyu Zhao <shanyu.zhao@...el.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@...el.com>
Signed-off-by: Reinette Chatre <reinette.chatre@...el.com>
CC: stable@...nel.org
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 1bd2cd8..83c52a6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -2041,16 +2041,14 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
tx_resp->failure_frame);
freed = iwl_tx_queue_reclaim(priv, txq_id, index);
- if (qc && likely(sta_id != IWL_INVALID_STATION))
- priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;
+ iwl_free_tfds_in_queue(priv, sta_id, tid, freed);
if (priv->mac80211_registered &&
(iwl_queue_space(&txq->q) > txq->q.low_mark))
iwl_wake_queue(priv, txq_id);
}
- if (qc && likely(sta_id != IWL_INVALID_STATION))
- iwl_txq_check_empty(priv, sta_id, tid, txq_id);
+ iwl_txq_check_empty(priv, sta_id, tid, txq_id);
if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK))
IWL_ERR(priv, "TODO: Implement Tx ABORT REQUIRED!!!\n");
--
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