From patchwork Sun Nov 8 07:49:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaehyun Lim X-Patchwork-Id: 7577481 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 26820C05C6 for ; Sun, 8 Nov 2015 07:50:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 35FA120610 for ; Sun, 8 Nov 2015 07:50:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 599D3205CB for ; Sun, 8 Nov 2015 07:50:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754765AbbKHHu0 (ORCPT ); Sun, 8 Nov 2015 02:50:26 -0500 Received: from mail-pa0-f51.google.com ([209.85.220.51]:34048 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754474AbbKHHuY (ORCPT ); Sun, 8 Nov 2015 02:50:24 -0500 Received: by padhx2 with SMTP id hx2so157834459pad.1 for ; Sat, 07 Nov 2015 23:50:23 -0800 (PST) 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=UhH0U0dcir7lDV+PjebSjsYsAC0hOIJLKRz7qY5ecfM=; b=e8hoVVfxV+Hz5tpZ5/+hz1PK/UmCck5g6byIBuhr8m7dc3rohOicpc0NROKgwi3tW+ gVRrH01anqme4BQQLyAKLhnn/d6igIqu0Y62b+B8OEv/jmHvBEujfUbk+kjOR5Wvdzdr byroqRrwF8fZD5bYj/rjrlxsivarj4dv5e6FJPrL6vnOGFxipzaaa3L6aGr2e0/5kgkY nhcxOLFHljWsFQRw+ob0Z3N0z/hoYAXrSeg7BsXr3xzugG82A0s5TV0z/MYfUT4NFtqw L81n0zmYCmxKUpBXc0VH42y6RBqyIF3dHKzGkzVa0O1LNj7s4EpIIpuV8c2ovGvvKdXE 8zgQ== X-Received: by 10.67.1.103 with SMTP id bf7mr29789080pad.147.1446969023821; Sat, 07 Nov 2015 23:50:23 -0800 (PST) Received: from localhost.localdomain ([218.233.16.2]) by smtp.gmail.com with ESMTPSA id tt7sm9435142pab.45.2015.11.07.23.50.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 07 Nov 2015 23:50:23 -0800 (PST) From: Chaehyun Lim To: gregkh@linuxfoundation.org Cc: johnny.kim@atmel.com, austin.shin@atmel.com, chris.park@atmel.com, tony.cho@atmel.com, glen.lee@atmel.com, leo.kim@atmel.com, linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org, Chaehyun Lim Subject: [PATCH 17/32] staging: wilc1000: rename u32KeyRSClen in host_int_add_rx_gtk Date: Sun, 8 Nov 2015 16:49:10 +0900 Message-Id: <1446968965-8958-17-git-send-email-chaehyun.lim@gmail.com> X-Mailer: git-send-email 2.6.3 In-Reply-To: <1446968965-8958-1-git-send-email-chaehyun.lim@gmail.com> References: <1446968965-8958-1-git-send-email-chaehyun.lim@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=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 This patch changes u32KeyRSClen to key_rsc_len to avoid camelcase. Signed-off-by: Chaehyun Lim --- drivers/staging/wilc1000/host_interface.c | 8 ++++---- drivers/staging/wilc1000/host_interface.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 22fdca5..32d4606 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -3275,7 +3275,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk, int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk, u8 gtk_key_len, u8 index, - u32 u32KeyRSClen, const u8 *KeyRSC, + u32 key_rsc_len, const u8 *KeyRSC, const u8 *pu8RxMic, const u8 *pu8TxMic, u8 mode, u8 u8Ciphermode) { @@ -3296,8 +3296,8 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk, u8KeyLen += TX_MIC_KEY_LEN; if (KeyRSC) { - msg.body.key_info.attr.wpa.seq = kmalloc(u32KeyRSClen, GFP_KERNEL); - memcpy(msg.body.key_info.attr.wpa.seq, KeyRSC, u32KeyRSClen); + msg.body.key_info.attr.wpa.seq = kmalloc(key_rsc_len, GFP_KERNEL); + memcpy(msg.body.key_info.attr.wpa.seq, KeyRSC, key_rsc_len); } msg.id = HOST_IF_MSG_KEY; @@ -3324,7 +3324,7 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk, msg.body.key_info.attr.wpa.index = index; msg.body.key_info.attr.wpa.key_len = u8KeyLen; - msg.body.key_info.attr.wpa.seq_len = u32KeyRSClen; + msg.body.key_info.attr.wpa.seq_len = key_rsc_len; result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg)); if (result) diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index 41ca349..f75bfa1 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -319,7 +319,7 @@ s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac, u32 *pu32InactiveTime); int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk, u8 gtk_key_len, u8 index, - u32 u32KeyRSClen, const u8 *KeyRSC, + u32 key_rsc_len, const u8 *KeyRSC, const u8 *pu8RxMic, const u8 *pu8TxMic, u8 mode, u8 u8Ciphermode); s32 host_int_add_tx_gtk(struct host_if_drv *hWFIDrv, u8 u8KeyLen,