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: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwmc3200wifi/tx.c b/drivers/net/wireless/iwmc3200wifi/tx.c
index 01cc2101e6820d98a3f94a73fe6a3d07b8aad5e2..55905f02309c1d2a41fbf4e9022fdcbca49b8e6f 100644 (file)
--- a/drivers/net/wireless/iwmc3200wifi/tx.c
+++ b/drivers/net/wireless/iwmc3200wifi/tx.c
@@ -354,8 +354,6 @@ static int iwm_tx_send_concat_packets(struct iwm_priv *iwm,
        return ret;
 }
 
-#define CONFIG_IWM_TX_CONCATENATED 1
-
 void iwm_tx_worker(struct work_struct *work)
 {
        struct iwm_priv *iwm;
@@ -414,11 +412,6 @@ void iwm_tx_worker(struct work_struct *work)
                           "%d, color: %d\n", txq->id, skb, tx_info->sta,
                           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)
                        iwm_tx_send_concat_packets(iwm, txq);
 
@@ -440,7 +433,7 @@ void iwm_tx_worker(struct work_struct *work)
                txq->concat_count += ALIGN(cmdlen, 16);
 
                mutex_unlock(&tid_info->mutex);
-#endif
+
                kfree_skb(skb);
        }