diff options
-rw-r--r-- | drivers/net/wireless/iwmc3200wifi/tx.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/tx.c b/drivers/net/wireless/iwmc3200wifi/tx.c index 01cc2101e682..55905f02309c 100644 --- 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, | |||
354 | return ret; | 354 | return ret; |
355 | } | 355 | } |
356 | 356 | ||
357 | #define CONFIG_IWM_TX_CONCATENATED 1 | ||
358 | |||
359 | void iwm_tx_worker(struct work_struct *work) | 357 | void iwm_tx_worker(struct work_struct *work) |
360 | { | 358 | { |
361 | struct iwm_priv *iwm; | 359 | struct iwm_priv *iwm; |
@@ -414,11 +412,6 @@ void iwm_tx_worker(struct work_struct *work) | |||
414 | "%d, color: %d\n", txq->id, skb, tx_info->sta, | 412 | "%d, color: %d\n", txq->id, skb, tx_info->sta, |
415 | tx_info->color); | 413 | tx_info->color); |
416 | 414 | ||
417 | #if !CONFIG_IWM_TX_CONCATENATED | ||
418 | /* temporarily keep this to comparing the performance */ | ||
419 | ret = iwm_send_packet(iwm, skb, pool_id); | ||
420 | #else | ||
421 | |||
422 | if (txq->concat_count + cmdlen > IWM_HAL_CONCATENATE_BUF_SIZE) | 415 | if (txq->concat_count + cmdlen > IWM_HAL_CONCATENATE_BUF_SIZE) |
423 | iwm_tx_send_concat_packets(iwm, txq); | 416 | iwm_tx_send_concat_packets(iwm, txq); |
424 | 417 | ||
@@ -440,7 +433,7 @@ void iwm_tx_worker(struct work_struct *work) | |||
440 | txq->concat_count += ALIGN(cmdlen, 16); | 433 | txq->concat_count += ALIGN(cmdlen, 16); |
441 | 434 | ||
442 | mutex_unlock(&tid_info->mutex); | 435 | mutex_unlock(&tid_info->mutex); |
443 | #endif | 436 | |
444 | kfree_skb(skb); | 437 | kfree_skb(skb); |
445 | } | 438 | } |
446 | 439 | ||