From f4ac5f71913502da58e026bdbc43a343ea95dcda Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 31 Aug 2011 09:38:30 +0300 Subject: [PATCH] --- yaml --- r: 265984 b: refs/heads/master c: 4690c33df6be8bf78a0d5fe58baae33462b0bc1f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c0e10fa9669d..44d0c40e0a9c 100644 --- 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 index 5dd6a6d1dfd7..ea6a0bc8ca20 100644 --- 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);