[kernel/f15] Revert 'iwlwifi: advertise max aggregate size'. (rhbz 708747)

[Dave Jones]

commit 3f743de566ab5bc0ba6126cfa9466faad4f40543
Author: Dave Jones <davej at redhat.com>
Date:   Mon Aug 22 17:09:03 2011 -0400

    Revert 'iwlwifi: advertise max aggregate size'. (rhbz 708747)

 iwlagn-revert-max-aggregate-size.patch |   13 +++++++++++++
 kernel.spec                            |    5 +++++
 2 files changed, 18 insertions(+), 0 deletions(-)
---
diff --git a/iwlagn-revert-max-aggregate-size.patch b/iwlagn-revert-max-aggregate-size.patch
new file mode 100644
index 0000000..d9e9a8d
--- /dev/null
+++ b/iwlagn-revert-max-aggregate-size.patch
@@ -0,0 +1,13 @@
+diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
+index b0ae4de..afa00ec 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
++++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
+@@ -2140,8 +2140,6 @@ static int iwl_mac_setup_register(struct iwl_priv *priv,
+ 		    IEEE80211_HW_SPECTRUM_MGMT |
+ 		    IEEE80211_HW_REPORTS_TX_ACK_STATUS;
+ 
+-	hw->max_tx_aggregation_subframes = LINK_QUAL_AGG_FRAME_LIMIT_DEF;
+-
+ 	hw->flags |= IEEE80211_HW_SUPPORTS_PS |
+ 		     IEEE80211_HW_SUPPORTS_DYNAMIC_PS;
+ 
diff --git a/kernel.spec b/kernel.spec
index 6b90d3c..80480a3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -683,6 +683,7 @@ Patch13001: epoll-fix-spurious-lockdep-warnings.patch
 Patch13002: hfsplus-ensure-bio-requests-are-not-smaller-than-the.patch
 
 Patch13010: iwlagn-check-for-priv--txq-in-iwlagn_wait_tx_queue_empty.patch
+Patch13011: iwlagn-revert-max-aggregate-size.patch
 
 Patch20000: utrace.patch
 
@@ -1267,6 +1268,7 @@ ApplyPatch epoll-fix-spurious-lockdep-warnings.patch
 ApplyPatch hfsplus-ensure-bio-requests-are-not-smaller-than-the.patch
 
 ApplyPatch iwlagn-check-for-priv--txq-in-iwlagn_wait_tx_queue_empty.patch
+ApplyPatch iwlagn-revert-max-aggregate-size.patch
 
 ApplyPatch utrace.patch
 
@@ -1898,6 +1900,9 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 22 2011 Dave Jones <davej at redhat.com>
+- Revert 'iwlwifi: advertise max aggregate size'. (rhbz 708747)
+
 * Mon Aug 22 2011 Chuck Ebbert <cebbert at redhat.com>
 - Update to 3.0.3-final