---

yaml --- r: 265984 b: refs/heads/master c: 4690c33 h: refs/heads/master v: v3
git-mirror · Sep 13, 2011 · f4ac5f7 · f4ac5f7
1 parent d5509a1
commit f4ac5f7
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: 427977ab2e24bb76c733cc50be97d4262028f14a
+refs/heads/master: 4690c33df6be8bf78a0d5fe58baae33462b0bc1f
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c b/trunk/drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
@@ -535,7 +535,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;
 	struct iwl_priv *priv = priv(trans);
 
 	txq_id = iwlagn_txq_ctx_activate_free(trans);