---

yaml --- r: 314225 b: refs/heads/master c: 559b1a2 h: refs/heads/master i: 314223: 27429fd v: v3
git-mirror · Jun 6, 2012 · 1ab610f · 1ab610f
1 parent 8735203
commit 1ab610f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc248615314c41abc2d6957e095c418ea9b12412
+refs/heads/master: 559b1a257ddeac637b8bb3a2c2469aaa2bde5383
diff --git a/trunk/drivers/net/wireless/iwlwifi/pcie/trans.c b/trunk/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -1060,8 +1060,7 @@ static void iwl_tx_start(struct iwl_trans *trans)
 
 	/* initiate the queues */
 	for (i = 0; i < trans->cfg->base_params->num_of_queues; i++) {
-		iwl_write_prph(trans, SCD_QUEUE_RDPTR(i), 0);
-		iwl_write_direct32(trans, HBUS_TARG_WRPTR, 0 | (i << 8));
+		iwl_trans_set_wr_ptrs(trans, i, 0);
 		iwl_write_targ_mem(trans, trans_pcie->scd_base_addr +
 				SCD_CONTEXT_QUEUE_OFFSET(i), 0);
 		iwl_write_targ_mem(trans, trans_pcie->scd_base_addr +
@@ -1075,8 +1074,6 @@ static void iwl_tx_start(struct iwl_trans *trans)
 				SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK));
 	}
 
-	iwl_trans_set_wr_ptrs(trans, trans_pcie->cmd_queue, 0);
-
 	for (i = 0; i < trans_pcie->n_q_to_fifo; i++) {
 		int fifo = trans_pcie->setup_q_to_fifo[i];