Commit 6b65b6ad authored by Samuel Ortiz's avatar Samuel Ortiz Committed by John W. Linville

iwmc3200wifi: Remove tx concatenation option

The tx concatenation option works fine now, we no longer need the debugging
option of disabling concatenation.
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b136b3a2
...@@ -354,8 +354,6 @@ static int iwm_tx_send_concat_packets(struct iwm_priv *iwm, ...@@ -354,8 +354,6 @@ static int iwm_tx_send_concat_packets(struct iwm_priv *iwm,
return ret; return ret;
} }
#define CONFIG_IWM_TX_CONCATENATED 1
void iwm_tx_worker(struct work_struct *work) void iwm_tx_worker(struct work_struct *work)
{ {
struct iwm_priv *iwm; struct iwm_priv *iwm;
...@@ -414,11 +412,6 @@ void iwm_tx_worker(struct work_struct *work) ...@@ -414,11 +412,6 @@ void iwm_tx_worker(struct work_struct *work)
"%d, color: %d\n", txq->id, skb, tx_info->sta, "%d, color: %d\n", txq->id, skb, tx_info->sta,
tx_info->color); tx_info->color);
#if !CONFIG_IWM_TX_CONCATENATED
/* temporarily keep this to comparing the performance */
ret = iwm_send_packet(iwm, skb, pool_id);
#else
if (txq->concat_count + cmdlen > IWM_HAL_CONCATENATE_BUF_SIZE) if (txq->concat_count + cmdlen > IWM_HAL_CONCATENATE_BUF_SIZE)
iwm_tx_send_concat_packets(iwm, txq); iwm_tx_send_concat_packets(iwm, txq);
...@@ -440,7 +433,7 @@ void iwm_tx_worker(struct work_struct *work) ...@@ -440,7 +433,7 @@ void iwm_tx_worker(struct work_struct *work)
txq->concat_count += ALIGN(cmdlen, 16); txq->concat_count += ALIGN(cmdlen, 16);
mutex_unlock(&tid_info->mutex); mutex_unlock(&tid_info->mutex);
#endif
kfree_skb(skb); kfree_skb(skb);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment