From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757922Ab2CMQ4e (ORCPT ); Tue, 13 Mar 2012 12:56:34 -0400 Received: from mail.windriver.com ([147.11.1.11]:64691 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757684Ab2CMQ4a (ORCPT ); Tue, 13 Mar 2012 12:56:30 -0400 Message-ID: <4F5F7C30.1020307@windriver.com> Date: Tue, 13 Mar 2012 12:56:16 -0400 From: Paul Gortmaker User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.27) Gecko/20120216 Thunderbird/3.1.19 MIME-Version: 1.0 To: =?UTF-8?B?QmrDuHJuIE1vcms=?= CC: , , "Fry, Donald H" , Wey-Yi Guy Subject: Re: [34-longterm 098/196] iwlagn: Support new 5000 microcode. References: <1331597724-31358-1-git-send-email-paul.gortmaker@windriver.com> <1331598109-31424-1-git-send-email-paul.gortmaker@windriver.com> <1331598109-31424-53-git-send-email-paul.gortmaker@windriver.com> <87k42olb91.fsf@nemi.mork.no> In-Reply-To: <87k42olb91.fsf@nemi.mork.no> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [128.224.146.65] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12-03-13 12:24 PM, Bjørn Mork wrote: > Paul Gortmaker writes: > >> From: "Fry, Donald H" >> >> ------------------- >> This is a commit scheduled for the next v2.6.34 longterm release. >> If you see a problem with using this for longterm, please comment. >> ------------------- >> >> commit 41504cce240f791f1e16561db95728c5537fbad9 upstream. >> >> New iwlwifi-5000 microcode requires driver support for API version 5. >> >> Signed-off-by: Don Fry >> Signed-off-by: Wey-Yi Guy >> Signed-off-by: Paul Gortmaker >> --- >> drivers/net/wireless/iwlwifi/iwl-5000.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> 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 > > This looks like the patch which broke the driver in stable-2.6.32.y and > was later reverted by: Thanks for the heads up. I'll be sure to drop this. Paul. -- > > > commit 2a96ae707525ef00a85bf374e56f0219c07eac5a > Author: Greg Kroah-Hartman > 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. > > This was reported by Gentoo, Arch, and Canonical developers as causing > problems for their users: > https://bugs.archlinux.org/task/24302 > http://bugs.gentoo.org/show_bug.cgi?id=359445 > https://bugs.launchpad.net/ubuntu/+source/linux/+bug/796336 > > Cc: Herton Ronaldo Krzesinski > Cc: Gordon Malm > Cc: Don Fry > Cc: Wey-Yi Guy > Cc: Stanislaw Gruszka > Signed-off-by: Greg Kroah-Hartman > > > > > Bjørn