---

yaml --- r: 266755 b: refs/heads/master c: 397ede3 h: refs/heads/master i: 266753: 7703653 266751: 298bff5 v: v3
git-mirror · Oct 14, 2011 · 0da3282 · 0da3282
1 parent a54c458
commit 0da3282
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a686c600268b71619f93d35f9373e2b6ab5947b
+refs/heads/master: 397ede37a4defbe0000f2cc994fe9b7225f33c89
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-core.c b/trunk/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -34,7 +34,6 @@
 #include <net/mac80211.h>
 
 #include "iwl-eeprom.h"
-#include "iwl-dev.h" /* FIXME: remove */
 #include "iwl-debug.h"
 #include "iwl-core.h"
 #include "iwl-io.h"

diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c b/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
@@ -30,8 +30,6 @@
 #include <linux/slab.h>
 #include <linux/sched.h>
 
-/* TODO: remove include to iwl-dev.h */
-#include "iwl-dev.h"
 #include "iwl-debug.h"
 #include "iwl-csr.h"
 #include "iwl-prph.h"
@@ -1020,9 +1018,8 @@ static int iwl_send_cmd_sync(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
 			HOST_COMPLETE_TIMEOUT);
 	if (!ret) {
 		if (test_bit(STATUS_HCMD_ACTIVE, &trans->shrd->status)) {
-			struct iwl_priv *priv = priv(trans);
 			struct iwl_tx_queue *txq =
-				&trans_pcie->txq[priv->shrd->cmd_queue];
+				&trans_pcie->txq[trans->shrd->cmd_queue];
 			struct iwl_queue *q = &txq->q;
 
 			IWL_ERR(trans,