From patchwork Sun Jul 6 09:35:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Grumbach X-Patchwork-Id: 4489541 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 C71169F1AC for ; Sun, 6 Jul 2014 09:36:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F14C02024C for ; Sun, 6 Jul 2014 09:36:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 17C7820254 for ; Sun, 6 Jul 2014 09:36:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751373AbaGFJgf (ORCPT ); Sun, 6 Jul 2014 05:36:35 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:55147 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750736AbaGFJge (ORCPT ); Sun, 6 Jul 2014 05:36:34 -0400 Received: by mail-wi0-f176.google.com with SMTP id n3so14614276wiv.15 for ; Sun, 06 Jul 2014 02:36:33 -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=FlTZZnQIFioV7ESXZrjeg/HjJCkw5r+16pyOyo0JIP4=; b=ZQhvQPV+GK2x1IgcxcUc4JAWXuDRPxQliXjwQ9lGadXXNCoPtNJfkpGbjVXlVm/vj6 fo9ZX46kA8E1fFHIgBz05WII+FzuxhRK/ahVLNQMIPiYC+/cxvnS7SQ6CNkTDhrM0quc 3TEmwnYS/2WcJJgxm/dszcayYNdSaqnX8d3fhzm1rDjm68qQmQqheaq+ZteikWVJyUa+ yG1GYm5M3lHhilOoCuvWuJmo5XbTKrY1SzIi9VeEsnQtMhUAqdvR0inXOWLtPv6zumfl +3F9lgB1jdx+7vsTU30S8kmXAV+jwbSkpqzrfSmrd58sl1hQGS4WsZN1PlsHK2bjMd6V i8tA== X-Received: by 10.180.13.139 with SMTP id h11mr69271790wic.40.1404639393067; Sun, 06 Jul 2014 02:36:33 -0700 (PDT) Received: from localhost.localdomain (109-186-76-70.bb.netvision.net.il. [109.186.76.70]) by mx.google.com with ESMTPSA id 20sm79585207wjt.42.2014.07.06.02.36.31 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 06 Jul 2014 02:36:32 -0700 (PDT) From: Emmanuel Grumbach To: linux-wireless@vger.kernel.org Cc: Emmanuel Grumbach Subject: [PATCH 08/40] iwlwifi: rename iwl_fw_error_fw_mon to iwl_fw_error_dump_fw_mon Date: Sun, 6 Jul 2014 12:35:44 +0300 Message-Id: <1404639376-3792-8-git-send-email-egrumbach@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <53B917DC.5050902@gmail.com> References: <53B917DC.5050902@gmail.com> 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.4 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: Emmanuel Grumbach This is matches the convention of the other structures. Signed-off-by: Emmanuel Grumbach --- drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h | 4 ++-- drivers/net/wireless/iwlwifi/pcie/trans.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h b/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h index 9fd860f..c39a0b8 100644 --- a/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h +++ b/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h @@ -147,14 +147,14 @@ struct iwl_fw_error_dump_info { } __packed; /** - * struct iwl_fw_error_fw_mon - FW monitor data + * struct iwl_fw_error_dump_fw_mon - FW monitor data * @fw_mon_wr_ptr: the position of the write pointer in the cyclic buffer * @fw_mon_base_ptr: base pointer of the data * @fw_mon_cycle_cnt: number of wrap arounds * @reserved: for future use * @data: captured data */ -struct iwl_fw_error_fw_mon { +struct iwl_fw_error_dump_fw_mon { __le32 fw_mon_wr_ptr; __le32 fw_mon_base_ptr; __le32 fw_mon_cycle_cnt; diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c index 5703a3d..5b5b0d8 100644 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c @@ -1787,7 +1787,7 @@ static u32 iwl_trans_pcie_dump_data(struct iwl_trans *trans, cmdq->q.n_window * (sizeof(*txcmd) + TFD_MAX_PAYLOAD_SIZE); if (trans_pcie->fw_mon_page) - len += sizeof(*data) + sizeof(struct iwl_fw_error_fw_mon) + + len += sizeof(*data) + sizeof(struct iwl_fw_error_dump_fw_mon) + trans_pcie->fw_mon_size; if (!buf) @@ -1822,7 +1822,7 @@ static u32 iwl_trans_pcie_dump_data(struct iwl_trans *trans, len += sizeof(*data); if (trans_pcie->fw_mon_page) { - struct iwl_fw_error_fw_mon *fw_mon_data; + struct iwl_fw_error_dump_fw_mon *fw_mon_data; data = iwl_fw_error_next_data(data); data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_FW_MONITOR);