Linux v3.5-rc3

4 files changed, 6 insertions, 104 deletions

diff --git a/iwlwifi-disable-the-buggy-chain-extension-feature-in-HW.patch b/iwlwifi-disable-the-buggy-chain-extension-feature-in-HW.patch
deleted file mode 100644
index c4f2ed3a1..000000000
--- a/iwlwifi-disable-the-buggy-chain-extension-feature-in-HW.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From d012d04e4d6312ea157b6cf19e9689af934f5aa7 Mon Sep 17 00:00:00 2001
-From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-Date: Wed, 6 Jun 2012 13:55:02 +0200
-Subject: [PATCH] iwlwifi: disable the buggy chain extension feature in HW
-
-This feature has been reported to be buggy and enabled by
-default. We therefore need to disable it manually.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: John W. Linville <linville@tuxdriver.com>
----
- drivers/net/wireless/iwlwifi/iwl-prph.h       |    1 +
- drivers/net/wireless/iwlwifi/iwl-trans-pcie.c |    5 +++++
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/net/wireless/iwlwifi/iwl-prph.h b/drivers/net/wireless/iwlwifi/iwl-prph.h
-index 3b10692..dfd5466 100644
---- a/drivers/net/wireless/iwlwifi/iwl-prph.h
-+++ b/drivers/net/wireless/iwlwifi/iwl-prph.h
-@@ -224,6 +224,7 @@
- #define SCD_TXFACT		(SCD_BASE + 0x10)
- #define SCD_ACTIVE		(SCD_BASE + 0x14)
- #define SCD_QUEUECHAIN_SEL	(SCD_BASE + 0xe8)
-+#define SCD_CHAINEXT_EN		(SCD_BASE + 0x244)
- #define SCD_AGGR_SEL		(SCD_BASE + 0x248)
- #define SCD_INTERRUPT_MASK	(SCD_BASE + 0x108)
- 
-diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
-index ec6fb39..79c6b91 100644
---- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
-@@ -1058,6 +1058,11 @@ static void iwl_tx_start(struct iwl_trans *trans)
- 	iwl_write_prph(trans, SCD_DRAM_BASE_ADDR,
- 		       trans_pcie->scd_bc_tbls.dma >> 10);
- 
-+	/* The chain extension of the SCD doesn't work well. This feature is
-+	 * enabled by default by the HW, so we need to disable it manually.
-+	 */
-+	iwl_write_prph(trans, SCD_CHAINEXT_EN, 0);
-+
- 	/* Enable DMA channel */
- 	for (chan = 0; chan < FH_TCSR_CHNL_NUM ; chan++)
- 		iwl_write_direct32(trans, FH_TCSR_CHNL_TX_CONFIG_REG(chan),
--- 
-1.7.7.6
-
diff --git a/iwlwifi-dont-mess-up-the-SCD-when-removing-a-key.patch b/iwlwifi-dont-mess-up-the-SCD-when-removing-a-key.patch
deleted file mode 100644
index f7c3c7181..000000000
--- a/iwlwifi-dont-mess-up-the-SCD-when-removing-a-key.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From d6ee27eb13beab94056e0de52d81220058ca2297 Mon Sep 17 00:00:00 2001
-From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-Date: Wed, 6 Jun 2012 09:13:36 +0200
-Subject: [PATCH] iwlwifi: don't mess up the SCD when removing a key
-
-When we remove a key, we put a key index which was supposed
-to tell the fw that we are actually removing the key. But
-instead the fw took that index as a valid index and messed
-up the SRAM of the device.
-
-This memory corruption on the device mangled the data of
-the SCD. The impact on the user is that SCD queue 2 got
-stuck after having removed keys.
-The message is the log that was printed is:
-
-Queue 2 stuck for 10000ms
-
-This doesn't seem to fix the higher queues that get stuck
-from time to time.
-
-Cc: stable@vger.kernel.org [2.6.27+]
-Reviewed-by: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com>
-Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: John W. Linville <linville@tuxdriver.com>
----
- drivers/net/wireless/iwlwifi/iwl-agn-sta.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
-index aea07aa..eb6a8ea 100644
---- a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
-@@ -1267,7 +1267,7 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv,
- 		key_flags |= STA_KEY_MULTICAST_MSK;
- 
- 	sta_cmd.key.key_flags = key_flags;
--	sta_cmd.key.key_offset = WEP_INVALID_OFFSET;
-+	sta_cmd.key.key_offset = keyconf->hw_key_idx;
- 	sta_cmd.sta.modify_mask = STA_MODIFY_KEY_MASK;
- 	sta_cmd.mode = STA_CONTROL_MODIFY_MSK;
- 
--- 
-1.7.6.5
-
diff --git a/kernel.spec b/kernel.spec
index cdf745a24..2e551e558 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 4
+%global baserelease 1
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -93,7 +93,7 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%define rcrev 2
+%define rcrev 3
 # The git snapshot level
 %define gitrev 0
 # Set rpm version accordingly
@@ -743,10 +743,6 @@ Patch22001: selinux-apply-different-permission-to-ptrace-child.patch
 #rhbz 829016
 Patch22022: thp-avoid-atomic64_read-in-pmd_read_atomic-for-32bit-PAE.patch
 
-#rhbz 825491
-Patch22023: iwlwifi-disable-the-buggy-chain-extension-feature-in-HW.patch
-Patch22024: iwlwifi-dont-mess-up-the-SCD-when-removing-a-key.patch
-
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1436,10 +1432,6 @@ ApplyPatch highbank-export-clock-functions.patch
 
 ApplyPatch thp-avoid-atomic64_read-in-pmd_read_atomic-for-32bit-PAE.patch
 
-#rhbz 825491
-ApplyPatch iwlwifi-disable-the-buggy-chain-extension-feature-in-HW.patch
-ApplyPatch iwlwifi-dont-mess-up-the-SCD-when-removing-a-key.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2290,6 +2282,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon Jun 18 2012 Josh Boyer <jwboyer@redhat.com> - -3.5.0-0.rc3.git0.1
+- Linux v3.5-rc3
+
 * Tue Jun 12 2012 Peter Robinson <pbrobinson@fedoraproject.org>
 - ARM: build in rtc modules so time gets set right on boot
 
diff --git a/sources b/sources
index bb4eda3e0..85301cb7c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 967f72983655e2479f951195953e8480  linux-3.4.tar.xz
-b465d27e5472446d2b03c3dd7d1d8bb9  patch-3.5-rc2.xz
+45159d08e4a0cdeda609e1a33492b98a  patch-3.5-rc3.xz