diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-03-14 08:59:34 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-03-14 08:59:34 -0400 |
| commit | 8e6c238a67b54c2342e9e83b3c78dc06c7686775 (patch) | |
| tree | 27455b738854ecbf6845ec290f32b66853e58e50 | |
| parent | fa46c0d82e72043da3ead2976fcc179e89ebaa9a (diff) | |
| download | longterm-queue-2.6.34-8e6c238a67b54c2342e9e83b3c78dc06c7686775.tar.gz | |
iwlagn: remove 5000 microcode patch
See later 2.6.32 commit:
commit 2a96ae707525ef00a85bf374e56f0219c07eac5a
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 15 13:12:35 2011 -0700
Revert "iwlagn: Support new 5000 microcode."
This reverts commit 6f63415fc1b690cb50c2ad48ba6e9e6e88e271b4.
It turns out this is not what we want to have happen for the .32 and
.33-longterm kernels as it does not work properly at all.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | audit/from-v2.6.32/audit.txt | 2 | ||||
| -rw-r--r-- | queue/iwlagn-Support-new-5000-microcode.patch | 29 | ||||
| -rw-r--r-- | queue/series | 1 |
3 files changed, 1 insertions, 31 deletions
diff --git a/audit/from-v2.6.32/audit.txt b/audit/from-v2.6.32/audit.txt index 5b0b116..9af1f07 100644 --- a/audit/from-v2.6.32/audit.txt +++ b/audit/from-v2.6.32/audit.txt @@ -2961,7 +2961,7 @@ ec9c7950 d9b41e0b v2.6.39 n 8ba5e329 4a5fa359 v2.6.39 n 548a4a8c 26cde9f7 v2.6.35 y in queue already 71447f83 678b77e2 v2.6.33 y -6f63415f 41504cce v2.6.38 n +6f63415f 41504cce v2.6.38 n/a NFG -later reverted 16933b04 5da24b76 v2.6.38 n 95204a57 b1d670f1 v2.6.38 n e18aff3d 6e0d9fd3 v2.6.39 n diff --git a/queue/iwlagn-Support-new-5000-microcode.patch b/queue/iwlagn-Support-new-5000-microcode.patch deleted file mode 100644 index 9b8ad35..0000000 --- a/queue/iwlagn-Support-new-5000-microcode.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a6e79c3b118a82d489b16487feedb58d6251db1c Mon Sep 17 00:00:00 2001 -From: "Fry, Donald H" <donald.h.fry@intel.com> -Date: Wed, 16 Feb 2011 11:49:34 -0800 -Subject: [PATCH] iwlagn: Support new 5000 microcode. - -commit 41504cce240f791f1e16561db95728c5537fbad9 upstream. - -New iwlwifi-5000 microcode requires driver support for API version 5. - -Signed-off-by: Don Fry <donald.h.fry@intel.com> -Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> -Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> - -diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c -index d05fad4..dc191b8 100644 ---- a/drivers/net/wireless/iwlwifi/iwl-5000.c -+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c -@@ -48,7 +48,7 @@ - #include "iwl-6000-hw.h" - - /* Highest firmware API version supported */ --#define IWL5000_UCODE_API_MAX 2 -+#define IWL5000_UCODE_API_MAX 5 - #define IWL5150_UCODE_API_MAX 2 - - /* Lowest firmware API version supported */ --- -1.7.7 - diff --git a/queue/series b/queue/series index 5a5efb2..29a21b4 100644 --- a/queue/series +++ b/queue/series @@ -104,7 +104,6 @@ kconfig-Avoid-buffer-underrun-in-choice-input.patch UBIFS-fix-master-node-recovery.patch Remove-extra-struct-page-member-from-the-buffer-info.patch dasd-correct-device-table.patch -iwlagn-Support-new-5000-microcode.patch slub-fix-panic-with-DISCONTIGMEM.patch set-memory-ranges-in-N_NORMAL_MEMORY-when-onlined.patch FLEXCOP-PCI-fix-__xlate_proc_name-warning-for-flexco.patch |