summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-08-24 08:41:30 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-08-24 08:42:15 -0400
commit04d46b9ad7786f1d3f3260bcf8b3e3be2ac71846 (patch)
treee9ddac49fdc847e676c0584a92b1984c8761ca2a
parentd20ff5e932dccbeac28c81b9b70a842b8fa60a9f (diff)
downloadkernel-04d46b9ad7786f1d3f3260bcf8b3e3be2ac71846.tar.gz
kernel-04d46b9ad7786f1d3f3260bcf8b3e3be2ac71846.tar.xz
kernel-04d46b9ad7786f1d3f3260bcf8b3e3be2ac71846.zip
Revert 'iwlwifi: advertise max aggregate size'. (rhbz 708747)
-rw-r--r--iwlagn-revert-max-aggregate-size.patch13
-rw-r--r--kernel.spec7
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 000000000..d9e9a8db4
--- /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 4c3919731..6f9305b8f 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
@@ -1358,6 +1359,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
@@ -2072,6 +2074,9 @@ fi
# ||----w |
# || ||
%changelog
+* Wed Aug 24 2011 Josh Boyer <jwboyer@redhat.com>
+- Revert 'iwlwifi: advertise max aggregate size'. (rhbz 708747)
+
* Mon Aug 22 2011 Josh Boyer <jwboyer@redhat.com>
- Linux 3.1-rc3
- Add patch to fix duplicate backlight registration (rhbz 732202)