From 91889cddfa081e8e2930bf03e6dce078b35822f3 Mon Sep 17 00:00:00 2001 From: Wey-Yi Guy Date: Thu, 15 Sep 2011 11:46:54 -0700 Subject: [PATCH] --- yaml --- r: 266283 b: refs/heads/master c: 143bb15de5ea904195d8e52cca7e2edbf5b31159 h: refs/heads/master i: 266281: ffe8f432850b0ddbbcfa2385ca273b42cd5d63e7 266279: 439d1be773d4fd26c60e9be815b6902afd1f472d v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7c371a37cbba..7fcad8ed85af 100644 --- 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 index 62c00523b3bf..c8e56858fa10 100644 --- 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) {