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

[Josh Boyer]

commit 1be8cbc361611079b563f5497c4b1458e227bafe
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Wed Aug 24 08:41:30 2011 -0400

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

 iwlagn-revert-max-aggregate-size.patch |   13 +++++++++++++
 kernel.spec                            |    7 ++++++-
 2 files changed, 19 insertions(+), 1 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 9ae502c..5677e05 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -51,7 +51,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be prepended with "0.", so
 # for example a 3 here will become 0.3
 #
-%global baserelease 0
+%global baserelease 1
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -729,6 +729,7 @@ Patch12205: runtime_pm_fixups.patch
 Patch12303: dmar-disable-when-ricoh-multifunction.patch
 
 Patch13003: efi-dont-map-boot-services-on-32bit.patch
+Patch13004: iwlagn-revert-max-aggregate-size.patch
 
 Patch20000: utrace.patch
 
@@ -1361,6 +1362,7 @@ ApplyPatch fix-intel-duplicate-backlight.patch
 ApplyPatch dmar-disable-when-ricoh-multifunction.patch
 
 ApplyPatch efi-dont-map-boot-services-on-32bit.patch
+ApplyPatch iwlagn-revert-max-aggregate-size.patch
 
 # utrace.
 ApplyPatch utrace.patch
@@ -2066,6 +2068,9 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 24 2011 Josh Boyer <jwboyer at redhat.com>
+- Revert 'iwlwifi: advertise max aggregate size'. (rhbz 708747)
+
 * Mon Aug 22 2011 Josh Boyer <jwboyer at redhat.com>
 - Linux 3.1-rc3
 - Add patch to fix duplicate backlight registration (rhbz 732202)