Received: by 10.192.165.156 with SMTP id m28csp1115156imm; Wed, 11 Apr 2018 12:43:02 -0700 (PDT) X-Google-Smtp-Source: AIpwx49/j2+nGoTwaZAGvFx5K+jTbegXOeHqHBtmc8rrx1rE0OsfpmO5Frj4qwUHhekt2BmnwFnw X-Received: by 10.99.126.73 with SMTP id o9mr4438440pgn.168.1523475782824; Wed, 11 Apr 2018 12:43:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523475782; cv=none; d=google.com; s=arc-20160816; b=aK4wb66boJHPNaVXSjCLfAyDSbHq5lPVfu4lvv6SKpCQHbJUbgkKhdAK98915usVXm QaURGxykzf1aV1inEezYoMv9GvGuOSmbNdEFZEwRRixf3JYfk0/wKf7Yq5YD1H2Pz+dP ULgfhaG+Fw1KdX1KkqEnCLOgR6OvuQej2qKmgNIN0d6ECM9FmXU4ChoT9l/lKQmSABdA nW2ewf4/Xo+Ea17KGZ+CnYhjGn20ld49yXDYQq2pHe7VBCF5BkD8dU6yVvGBkOC0kc15 IpAmO78i57hS6zCiXw83iJiKzvwrhTpFzCElx9oOcEu5ixKf9MWvFIoEGCxV9oQIs8Lx w9RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=/kOZtC4W8CJV8hwVv+rCuFyVOhG4A6TAoPsQkiNodtY=; b=n5WAAThaVbH/qSZmrnmlR69e9LfMVEl3+X4+G3jtupuZ770RvNV5a09YaCobIwy6zH rWrXnDyWQwt8tljebPc+VGTi2uSeGK/BXPnKyT3fAWsZQfhqSrrX/clRbm8AiSDRzgrt w7eqxfkSnLulVS7VnnoQCvL7kRyNztsw3UXt3tUTPmFDEGM7TY7KolzrUG/Fqw8y6Plc YAe6OSq1c4NRRv5U2tLhVu5HUNpXR1pubS5XOlL9fspyzzz3N6ARH2c+Kr5Vxta8oGtg O+vpJf2MxZm/eo5X6bTfrUwVleOWLpGi4tQN1uHgTp4HaW3jnDK7CyQcUWVtioACDiXY OwuA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u70si1373889pfj.341.2018.04.11.12.42.26; Wed, 11 Apr 2018 12:43:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934344AbeDKTB5 (ORCPT + 99 others); Wed, 11 Apr 2018 15:01:57 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:38348 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934331AbeDKTBx (ORCPT ); Wed, 11 Apr 2018 15:01:53 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id CB40BDAC; Wed, 11 Apr 2018 19:01:52 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Luca Coelho , Sasha Levin Subject: [PATCH 4.9 202/310] iwlwifi: fix min API version for 7265D, 3168, 8000 and 8265 Date: Wed, 11 Apr 2018 20:35:41 +0200 Message-Id: <20180411183631.266673968@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183622.305902791@linuxfoundation.org> References: <20180411183622.305902791@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Luca Coelho [ Upstream commit 15098803d38778070b8edfa5a3d5fc4fef10d0a1 ] In a previous commit, we removed support for API versions earlier than 22 for these NICs. By mistake, the *_UCODE_API_MIN definitions were set to 17. Fix that. Fixes: 4b87e5af638b ("iwlwifi: remove support for fw older than -17 and -22") Signed-off-by: Luca Coelho Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/intel/iwlwifi/iwl-7000.c | 4 ++-- drivers/net/wireless/intel/iwlwifi/iwl-8000.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) --- a/drivers/net/wireless/intel/iwlwifi/iwl-7000.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-7000.c @@ -79,8 +79,8 @@ /* Lowest firmware API version supported */ #define IWL7260_UCODE_API_MIN 17 #define IWL7265_UCODE_API_MIN 17 -#define IWL7265D_UCODE_API_MIN 17 -#define IWL3168_UCODE_API_MIN 20 +#define IWL7265D_UCODE_API_MIN 22 +#define IWL3168_UCODE_API_MIN 22 /* NVM versions */ #define IWL7260_NVM_VERSION 0x0a1d --- a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c @@ -74,8 +74,8 @@ #define IWL8265_UCODE_API_MAX 26 /* Lowest firmware API version supported */ -#define IWL8000_UCODE_API_MIN 17 -#define IWL8265_UCODE_API_MIN 20 +#define IWL8000_UCODE_API_MIN 22 +#define IWL8265_UCODE_API_MIN 22 /* NVM versions */ #define IWL8000_NVM_VERSION 0x0a1d