From: Paul Stewart <pstew@chromium.org>
Date: Wed, 16 Jan 2013 23:00:17 +0000 (-0800)
Subject: Revert "CHROMIUMOS: mwifiex: Disable transmit aggregation"
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=eeca2cc8bf30f660f423dc16dc0b229530589cdf;p=people%2Faperard%2Flinux-chromebook.git

Revert "CHROMIUMOS: mwifiex: Disable transmit aggregation"

New firmware fixes this issue, so this change is no longer necessary.

This reverts commit 6fcfecca9575848120e8c9e35b3ad848b1e85f29

BUG=chrome-os-partner:16279
TEST=Associate with Android AP

Change-Id: Id0542875bc599bf5da23cdeb0da57739cc60c44d
Reviewed-on: https://gerrit.chromium.org/gerrit/41467
Reviewed-by: Bing Zhao <bzhao@marvell.com>
Reviewed-by: Christopher Wiley <wiley@chromium.org>
Commit-Queue: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>
---

diff --git a/drivers/net/wireless/mwifiex/wmm.c b/drivers/net/wireless/mwifiex/wmm.c
index c8d4fdad2d585..2d26babed8f5c 100644
--- a/drivers/net/wireless/mwifiex/wmm.c
+++ b/drivers/net/wireless/mwifiex/wmm.c
@@ -78,9 +78,6 @@ static u8 tos_to_tid_inv[] = {
 
 static u8 ac_to_tid[4][2] = { {1, 2}, {0, 3}, {4, 5}, {6, 7} };
 
-static int disable_tx_aggregation = 1;
-module_param(disable_tx_aggregation, int, 0644);
-
 /*
  * This function debug prints the priority parameters for a WMM AC.
  */
@@ -1214,7 +1211,6 @@ mwifiex_dequeue_tx_packet(struct mwifiex_adapter *adapter)
 	}
 
 	if (!ptr->is_11n_enabled ||
-	    disable_tx_aggregation ||
 	    mwifiex_is_ba_stream_setup(priv, ptr, tid) ||
 	    priv->wps.session_enable ||
 	    ((priv->sec_info.wpa_enabled ||