From patchwork Tue Oct 21 16:04:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Grumbach X-Patchwork-Id: 5126201 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 940199F387 for ; Tue, 21 Oct 2014 16:05:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C4A0A20221 for ; Tue, 21 Oct 2014 16:05:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E33562021B for ; Tue, 21 Oct 2014 16:05:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755930AbaJUQE4 (ORCPT ); Tue, 21 Oct 2014 12:04:56 -0400 Received: from mail-wg0-f47.google.com ([74.125.82.47]:64254 "EHLO mail-wg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755859AbaJUQEz (ORCPT ); Tue, 21 Oct 2014 12:04:55 -0400 Received: by mail-wg0-f47.google.com with SMTP id x13so1749016wgg.18 for ; Tue, 21 Oct 2014 09:04:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=g+3vwuaj1Uex7LyLDfQDJJxiQTW/6qRvYX61ew0jAs4=; b=RnrqLIV5jvVPx1L9RQW6tniU0ueEwdT1L6n5h9TA9Cg33lqc/GOl39c9UfUXG7G4f9 M19wELTI3GUGW6RGHfo+BaHtexjl7Ug0deP7PtsSnW5TcrMUSaZ0Mdfukk+r7ItgYU8g r14qHhgYp4RjUcbcDB1GF/2UVDM1YLiKhVAA2NTpDK59m8N92yswkpmtEYsbIXSJ2aI9 xa2aBeHTBkiG/VqPPi3pXVbNfYzbmYED5wgHr04h8KUi8PtjUm2a/wC11PGavMGSkuzq M+mcGXlb1Yj5j6OFMODM6s5OdhZAvoKgPn5MPr4GIyZlaClvmObQvaQqEoalEpbXvHfP UyPg== X-Received: by 10.180.90.105 with SMTP id bv9mr30689101wib.53.1413907493742; Tue, 21 Oct 2014 09:04:53 -0700 (PDT) Received: from localhost.localdomain (89-139-27-62.bb.netvision.net.il. [89.139.27.62]) by mx.google.com with ESMTPSA id fr6sm294699wic.1.2014.10.21.09.04.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 21 Oct 2014 09:04:53 -0700 (PDT) From: Emmanuel Grumbach To: linux-wireless@vger.kernel.org Cc: Liad Kaufman , Emmanuel Grumbach Subject: [PATCH 2/8] iwlwifi: 8000: fix string given to MODULE_FIRMWARE Date: Tue, 21 Oct 2014 19:04:33 +0300 Message-Id: <1413907479-9073-2-git-send-email-egrumbach@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 From: Liad Kaufman I changed the string but forgot to update the fix also to MODULE_FIRMWARE(). Signed-off-by: Liad Kaufman Signed-off-by: Emmanuel Grumbach --- drivers/net/wireless/iwlwifi/iwl-8000.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/iwlwifi/iwl-8000.c b/drivers/net/wireless/iwlwifi/iwl-8000.c index e435148..d2b7234 100644 --- a/drivers/net/wireless/iwlwifi/iwl-8000.c +++ b/drivers/net/wireless/iwlwifi/iwl-8000.c @@ -82,7 +82,8 @@ #define IWL8000_TX_POWER_VERSION 0xffff /* meaningless */ #define IWL8000_FW_PRE "iwlwifi-8000" -#define IWL8000_MODULE_FIRMWARE(api) IWL8000_FW_PRE __stringify(api) ".ucode" +#define IWL8000_MODULE_FIRMWARE(api) \ + IWL8000_FW_PRE "-" __stringify(api) ".ucode" #define NVM_HW_SECTION_NUM_FAMILY_8000 10 #define DEFAULT_NVM_FILE_FAMILY_8000 "iwl_nvm_8000.bin"