From cabf4fa6625899ae9408954709062f29080ae5b6 Mon Sep 17 00:00:00 2001 From: Emmanuel Grumbach Date: Tue, 8 Nov 2011 03:55:21 -0800 Subject: [PATCH] --- yaml --- r: 278837 b: refs/heads/master c: cccb265d0275537022ce4e9d34a56ec6c0cf333e h: refs/heads/master i: 278835: d628883627598acc9e9c17b79b90684bb8a6d576 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8b322a59dd2d..a2e40913af3b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b88f5be0074fef306f9346175088491867905ebd +refs/heads/master: cccb265d0275537022ce4e9d34a56ec6c0cf333e 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 b93acce08bd2..79331fb10aa5 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c @@ -559,7 +559,6 @@ int iwl_trans_pcie_tx_agg_alloc(struct iwl_trans *trans, tid_data->agg.txq_id = txq_id; iwl_set_swq_id(&trans_pcie->txq[txq_id], get_ac_from_tid(tid), txq_id); - tid_data = &trans->shrd->tid_data[sta_id][tid]; if (tid_data->tfds_in_queue == 0) { IWL_DEBUG_TX_QUEUES(trans, "HW queue is empty\n"); tid_data->agg.state = IWL_AGG_ON;