From patchwork Sun Nov 8 07:49:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaehyun Lim X-Patchwork-Id: 7577501 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 793AEC05C6 for ; Sun, 8 Nov 2015 07:50:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A5B3B20610 for ; Sun, 8 Nov 2015 07:50:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B8DBE205CB for ; Sun, 8 Nov 2015 07:50:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754770AbbKHHuc (ORCPT ); Sun, 8 Nov 2015 02:50:32 -0500 Received: from mail-pa0-f41.google.com ([209.85.220.41]:34096 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754474AbbKHHua (ORCPT ); Sun, 8 Nov 2015 02:50:30 -0500 Received: by padhx2 with SMTP id hx2so157835809pad.1 for ; Sat, 07 Nov 2015 23:50:29 -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=nuEBy72dJA0T7TFrbvzpEkeAM04OGZ/Ml/dMCgJrSAc=; b=diHMi1GCBqqwiifybOaZc1aG8Rbu/PRPD9zMOOsK5cm4yNThncwDehsqkdrFks9eZe QkpsAzQVlYU881yW+OGMKijt0BJSmwiNfAxVUgT3vQpqtfABY0D7tEkEjtEyDU1RpLQV z3WXyFm1N2upXnMHKZ8MGrrXZBh19n7seA78PSNRBCFkgbP2eCRcYntx3Xulm9OQIO/M ww/FBQ7mqO9pytBvKGqch9ya83EDzFulZ/6doc7G+s5++oxVVO50FpqG3M+GVdfBEpmk 7PEG9CFieM48dr+5xpSNbwKridzgREY28H75gAyUHW7sehIoLPMTj1/ZsuZUheYgXtBH dsLQ== X-Received: by 10.68.202.170 with SMTP id kj10mr30088797pbc.166.1446969029723; Sat, 07 Nov 2015 23:50:29 -0800 (PST) Received: from localhost.localdomain ([218.233.16.2]) by smtp.gmail.com with ESMTPSA id tt7sm9435142pab.45.2015.11.07.23.50.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 07 Nov 2015 23:50:29 -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 19/32] staging: wilc1000: rename pu8RxMic in host_int_add_rx_gtk Date: Sun, 8 Nov 2015 16:49:12 +0900 Message-Id: <1446968965-8958-19-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 pu8RxMic to rx_mic 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 b50e78d..df364dc 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -3276,7 +3276,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 key_rsc_len, const u8 *key_rsc, - const u8 *pu8RxMic, const u8 *pu8TxMic, + const u8 *rx_mic, const u8 *pu8TxMic, u8 mode, u8 u8Ciphermode) { int result = 0; @@ -3289,7 +3289,7 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk, } memset(&msg, 0, sizeof(struct host_if_msg)); - if (pu8RxMic) + if (rx_mic) u8KeyLen += RX_MIC_KEY_LEN; if (pu8TxMic) @@ -3314,8 +3314,8 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk, msg.body.key_info.attr.wpa.key = kmalloc(u8KeyLen, GFP_KERNEL); memcpy(msg.body.key_info.attr.wpa.key, rx_gtk, gtk_key_len); - if (pu8RxMic) - memcpy(msg.body.key_info.attr.wpa.key + 16, pu8RxMic, + if (rx_mic) + memcpy(msg.body.key_info.attr.wpa.key + 16, rx_mic, RX_MIC_KEY_LEN); if (pu8TxMic) diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index 66bb7d7..42c8749 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -320,7 +320,7 @@ s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac, int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk, u8 gtk_key_len, u8 index, u32 key_rsc_len, const u8 *key_rsc, - const u8 *pu8RxMic, const u8 *pu8TxMic, + const u8 *rx_mic, const u8 *pu8TxMic, u8 mode, u8 u8Ciphermode); s32 host_int_add_tx_gtk(struct host_if_drv *hWFIDrv, u8 u8KeyLen, u8 *pu8TxGtk, u8 u8KeyIdx);