---

yaml --- r: 266283 b: refs/heads/master c: 143bb15 h: refs/heads/master i: 266281: ffe8f43 266279: 439d1be v: v3
git-mirror · Sep 19, 2011 · 91889cd · 91889cd
1 parent 70ce7d4
commit 91889cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 000850065c3b8ee6c9e8125496be3ee9773903cc
+refs/heads/master: 143bb15de5ea904195d8e52cca7e2edbf5b31159
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c b/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
@@ -544,7 +544,7 @@ int iwl_trans_pcie_tx_agg_alloc(struct iwl_trans *trans,
 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 	struct iwl_tid_data *tid_data;
 	unsigned long flags;
-	u16 txq_id;
+	int txq_id;
 
 	txq_id = iwlagn_txq_ctx_activate_free(trans);
 	if (txq_id == -1) {