From patchwork Tue Apr 12 08:59:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Grumbach X-Patchwork-Id: 8807981 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 57B6CC0553 for ; Tue, 12 Apr 2016 08:59:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8E17120306 for ; Tue, 12 Apr 2016 08:59:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A2E85202D1 for ; Tue, 12 Apr 2016 08:59:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932256AbcDLI7O (ORCPT ); Tue, 12 Apr 2016 04:59:14 -0400 Received: from mga01.intel.com ([192.55.52.88]:60840 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932109AbcDLI7L (ORCPT ); Tue, 12 Apr 2016 04:59:11 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP; 12 Apr 2016 01:59:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,473,1455004800"; d="scan'208";a="684866484" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by FMSMGA003.fm.intel.com with ESMTP; 12 Apr 2016 01:59:05 -0700 Received: from fmsmsx112.amr.corp.intel.com (10.18.116.6) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 12 Apr 2016 01:59:04 -0700 Received: from hasmsx105.ger.corp.intel.com (10.184.198.19) by FMSMSX112.amr.corp.intel.com (10.18.116.6) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 12 Apr 2016 01:59:04 -0700 Received: from hasmsx107.ger.corp.intel.com ([169.254.6.230]) by HASMSX105.ger.corp.intel.com ([169.254.1.106]) with mapi id 14.03.0248.002; Tue, 12 Apr 2016 11:59:01 +0300 From: "Grumbach, Emmanuel" To: "kvalo@codeaurora.org" CC: "linux-wireless@vger.kernel.org" Subject: Re: pull request: iwlwifi 2016-04-12 Thread-Topic: pull request: iwlwifi 2016-04-12 Thread-Index: AQHRlJNhdwBHKi+jZkK/+rhOQVt3iZ+F16uA Date: Tue, 12 Apr 2016 08:59:00 +0000 Message-ID: <1460451541.2630.16.camel@intel.com> References: <1460448889.2630.12.camel@intel.com> In-Reply-To: <1460448889.2630.12.camel@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.12.124.115] Content-ID: <58DEAF91DB93F74E812BA0C58F5C6B17@intel.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Tue, 2016-04-12 at 11:14 +0300, Emmanuel Grumbach wrote: > Hi Kalle, > > I have here a pull request for 4.6. There is patch in this pull > request > that has been sent to -next already but should really have been > included in the current cycle. Sorry for the mess. > > The commit appears in -next as: > > commit a0b09f13036cedfd67c9cb4b9d05138e7022723d > Author: Ayala Beker > Date: Wed Feb 3 15:36:52 2016 +0200 > > iwlwifi: mvm: update GSCAN capabilities > > Gscan capabilities were updated with new capabilities supported > by the device. Update GSCAN capabilities TLV. > > I modified the commit message to better emphasis the need to have it > in > the current release. You'll see it in this pull request as: > > commit cd49727e1a2bccc4ff008dde24c2f8430dd9e368 > Author: Ayala Beker > Date: Wed Feb 3 15:36:52 2016 +0200 > > iwlwifi: mvm: avoid to WARN about gscan capabilities > > Gscan capabilities were updated with new capabilities supported > by the device. Update GSCAN capabilities TLV and avoid to WARN > if the firmware does not have the new capabilities. > > Besides this, all is fairly normal. > Please pull, thanks! > > > The following changes since commit > 7fdf9663261cc77a516396fec82cee8a8ea07e76: > > iwlwifi: mvm: fix memory leak in paging (2016-03-20 23:01:54 +0200) > > are available in the git repository at: > > https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fix > es.git tags/iwlwifi-for-kalle-2016-04-12 > > for you to fetch changes up to > 2d25fb8b3a138706b63bd26ad72a95c58029954a: > > iwlwifi: mvm: fix accessing Null pointer during fw dump collection > (2016-04-12 10:03:17 +0300) > Sara found an embarrassing last minute issue. New tag is iwlwifi-for-kalle-2016-04-12_2. Here is the diff: > ---------------------------------------------------------------- > * add new device IDs for 8265 > * fix a NULL pointer dereference when paging firmware asserts > * remove a WARNING on gscan capabilities > * fix MODULE_FIRMWARE for 8260 > > ---------------------------------------------------------------- > Ayala Beker (1): > iwlwifi: mvm: avoid to WARN about gscan capabilities > > Matti Gottlieb (1): > iwlwifi: mvm: fix accessing Null pointer during fw dump > collection > > Oren Givon (1): > iwlwifi: add device IDs for the 8265 device > > Sara Sharon (1): > iwlwifi: 8000: fix MODULE_FIRMWARE input > > drivers/net/wireless/intel/iwlwifi/iwl-8000.c | 2 +- > drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 26 ++++++++++----- > ----------- > drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 6 ++++-- > drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 2 ++ > drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 10 ++++++++++ > 5 files changed, 27 insertions(+), 19 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c index cf48122..b5c57ee 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c @@ -93,7 +93,7 @@ #define IWL8260_SMEM_OFFSET 0x400000 #define IWL8260_SMEM_LEN 0x68000 -#define IWL8000_FW_PRE "iwlwifi-8000C" +#define IWL8000_FW_PRE "iwlwifi-8000C-" #define IWL8000_MODULE_FIRMWARE(api) \ IWL8000_FW_PRE "-" __stringify(api) ".ucode"