From patchwork Sun Oct 18 17:47:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 7431511 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6A4799F36A for ; Sun, 18 Oct 2015 17:47:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C2B602061D for ; Sun, 18 Oct 2015 17:47:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D080F20600 for ; Sun, 18 Oct 2015 17:47:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932190AbbJRRrW (ORCPT ); Sun, 18 Oct 2015 13:47:22 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:57362 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932183AbbJRRrV (ORCPT ); Sun, 18 Oct 2015 13:47:21 -0400 Received: from deadeye.wl.decadent.org.uk ([192.168.4.247] helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84) (envelope-from ) id 1Zns39-0007J0-Ia; Sun, 18 Oct 2015 18:47:15 +0100 Received: from ben by deadeye with local (Exim 4.86) (envelope-from ) id 1Zns34-0003sU-DT; Sun, 18 Oct 2015 18:47:10 +0100 Message-ID: <1445190425.31451.70.camel@decadent.org.uk> Subject: [PATCH] iwlwifi: Fix module firmware information for 3160 From: Ben Hutchings To: Johannes Berg , Emmanuel Grumbach Cc: Intel Linux Wireless , linux-wireless Date: Sun, 18 Oct 2015 18:47:05 +0100 X-Mailer: Evolution 3.18.0-2 Mime-Version: 1.0 X-SA-Exim-Connect-IP: 192.168.4.247 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, T_TVD_MIME_EPI, UNPARSEABLE_RELAY autolearn=ham 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 IWL3160_UCODE_API_OK is no longer defined, so we end up with this in the module information: firmware:       iwlwifi-3160-IWL3160_UCODE_API_OK.ucode It looks like IWL7260_UCODE_API_OK should be used instead now. Fixes: ed65918735a5 ("iwlwifi: 7000: modify the firmware name for 3165") Signed-off-by: Ben Hutchings ---  drivers/net/wireless/iwlwifi/iwl-7000.c | 2 +-  1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/iwlwifi/iwl-7000.c b/drivers/net/wireless/iwlwifi/iwl-7000.c index cc35f79..d7acbd1 100644 --- a/drivers/net/wireless/iwlwifi/iwl-7000.c +++ b/drivers/net/wireless/iwlwifi/iwl-7000.c @@ -348,6 +348,6 @@ const struct iwl_cfg iwl7265d_n_cfg = {  };    MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_OK)); -MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL3160_UCODE_API_OK)); +MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));  MODULE_FIRMWARE(IWL7265_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));  MODULE_FIRMWARE(IWL7265D_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));