From patchwork Thu Feb 25 00:15:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaehyun Lim X-Patchwork-Id: 8415281 X-Patchwork-Delegate: kvalo@adurom.com 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 630C99F2F0 for ; Thu, 25 Feb 2016 00:16:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6D790202EB for ; Thu, 25 Feb 2016 00:16:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6D19D202E6 for ; Thu, 25 Feb 2016 00:16:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757357AbcBYAQI (ORCPT ); Wed, 24 Feb 2016 19:16:08 -0500 Received: from mail-pa0-f47.google.com ([209.85.220.47]:33193 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751373AbcBYAQG (ORCPT ); Wed, 24 Feb 2016 19:16:06 -0500 Received: by mail-pa0-f47.google.com with SMTP id fl4so21505211pad.0 for ; Wed, 24 Feb 2016 16:16:06 -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=sYc+W7Gep4NS2bXrTyd8SE75H3G7P9bEVMXSFJ2GfIo=; b=LuGPiCxz6el1w7AjpdQy5orSVmZAYSo8Vg2Tpjs2Mndr2hq0i09LBJ0c0cfPk/iUyj JMhfZ25Lb+zSm5qazBufEbyRvpkT4fxD7RPpC0JoMo0Ke496lJ/Aox6mqUflH2n5oOoE 8Ro5+gPcZy++5yRAPYqCacI8lMC2oGri+s12XDTQDj2P1jyTatBW/vI26ivrtCoc6X8/ WM6DSFjLT5Fp/mJm1SqYuDQ85Bi3VLNQvkU2xxbybtKa1G9gSste/ZXVfTF+FN800BLm r/bCzCCmsiC0koti+0Vu3TGXmtuxoi3ckkd5dyj9dGFqluFaiICZ8P4Zo0jlyEX7cG6X 22sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sYc+W7Gep4NS2bXrTyd8SE75H3G7P9bEVMXSFJ2GfIo=; b=gZQ1IWWICAZVJKLILmiwW71hvRFptvZGvPuiAW2XqZdTZPuihgcF2cibt0FAUjJfMA G+yrL+kkB/DTQApYOTUhNnnUYpy0VoKyoPpz8F4st82eux1fAla96Xs4Vw0WiJq1xVqr PAWZhqS6aSyfT+pVjiYzSv62O13jMBXPvScauWV4ouL54g7/0vLcSBNGaUHakm01PJzu VxNg909rYM/775t0xmwsE7vPBfdoSFTZT/lMxQ8D8NcNmvscq09T1oGUvhzk7rnOJfYx IYO4U3/0zApSclz9dTfsgsx0zXupgHh6bWVEwP/0sewWuQ8xbex4k5YtK6IQl2i3Zu51 9DSg== X-Gm-Message-State: AG10YOQbfRxL9G6VQVltxm4abnGj83/Wn2pnO7CSS8KJOUGERufnkzYV70SBIhMDJFEQfg== X-Received: by 10.66.190.131 with SMTP id gq3mr58221209pac.42.1456359365965; Wed, 24 Feb 2016 16:16:05 -0800 (PST) Received: from localhost.localdomain ([218.233.16.2]) by smtp.gmail.com with ESMTPSA id h66sm7476150pfd.91.2016.02.24.16.16.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 Feb 2016 16:16:05 -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 3/9] staging: wilc1000: rename pu8ReqIEs in struct connect_info Date: Thu, 25 Feb 2016 09:15:44 +0900 Message-Id: <1456359350-17118-3-git-send-email-chaehyun.lim@gmail.com> X-Mailer: git-send-email 2.7.1 In-Reply-To: <1456359350-17118-1-git-send-email-chaehyun.lim@gmail.com> References: <1456359350-17118-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, 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 This patch renames pu8ReqIEs to req_ies to avoid camelcase. Signed-off-by: Chaehyun Lim --- drivers/staging/wilc1000/coreconfigurator.h | 2 +- drivers/staging/wilc1000/host_interface.c | 24 +++++++++++------------ drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h index a32f466..5ef4fd1 100644 --- a/drivers/staging/wilc1000/coreconfigurator.h +++ b/drivers/staging/wilc1000/coreconfigurator.h @@ -107,7 +107,7 @@ struct connect_resp_info { struct connect_info { u8 bssid[6]; - u8 *pu8ReqIEs; + u8 *req_ies; size_t ReqIEsLen; u8 *pu8RespIEs; u16 u16RespIEsLen; diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 4a1bad8..55ed96e 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -1159,8 +1159,8 @@ ERRORHANDLER: if (pstrHostIFconnectAttr->ies) { strConnectInfo.ReqIEsLen = pstrHostIFconnectAttr->ies_len; - strConnectInfo.pu8ReqIEs = kmalloc(pstrHostIFconnectAttr->ies_len, GFP_KERNEL); - memcpy(strConnectInfo.pu8ReqIEs, + strConnectInfo.req_ies = kmalloc(pstrHostIFconnectAttr->ies_len, GFP_KERNEL); + memcpy(strConnectInfo.req_ies, pstrHostIFconnectAttr->ies, pstrHostIFconnectAttr->ies_len); } @@ -1171,8 +1171,8 @@ ERRORHANDLER: NULL, pstrHostIFconnectAttr->arg); hif_drv->hif_state = HOST_IF_IDLE; - kfree(strConnectInfo.pu8ReqIEs); - strConnectInfo.pu8ReqIEs = NULL; + kfree(strConnectInfo.req_ies); + strConnectInfo.req_ies = NULL; } else { netdev_err(vif->ndev, "Connect callback is NULL\n"); @@ -1266,8 +1266,8 @@ static s32 Handle_ConnectTimeout(struct wilc_vif *vif) if (hif_drv->usr_conn_req.ies) { strConnectInfo.ReqIEsLen = hif_drv->usr_conn_req.ies_len; - strConnectInfo.pu8ReqIEs = kmalloc(hif_drv->usr_conn_req.ies_len, GFP_KERNEL); - memcpy(strConnectInfo.pu8ReqIEs, + strConnectInfo.req_ies = kmalloc(hif_drv->usr_conn_req.ies_len, GFP_KERNEL); + memcpy(strConnectInfo.req_ies, hif_drv->usr_conn_req.ies, hif_drv->usr_conn_req.ies_len); } @@ -1278,8 +1278,8 @@ static s32 Handle_ConnectTimeout(struct wilc_vif *vif) NULL, hif_drv->usr_conn_req.arg); - kfree(strConnectInfo.pu8ReqIEs); - strConnectInfo.pu8ReqIEs = NULL; + kfree(strConnectInfo.req_ies); + strConnectInfo.req_ies = NULL; } else { netdev_err(vif->ndev, "Connect callback is NULL\n"); } @@ -1503,8 +1503,8 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif, if (hif_drv->usr_conn_req.ies) { strConnectInfo.ReqIEsLen = hif_drv->usr_conn_req.ies_len; - strConnectInfo.pu8ReqIEs = kmalloc(hif_drv->usr_conn_req.ies_len, GFP_KERNEL); - memcpy(strConnectInfo.pu8ReqIEs, + strConnectInfo.req_ies = kmalloc(hif_drv->usr_conn_req.ies_len, GFP_KERNEL); + memcpy(strConnectInfo.req_ies, hif_drv->usr_conn_req.ies, hif_drv->usr_conn_req.ies_len); } @@ -1533,8 +1533,8 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif, kfree(strConnectInfo.pu8RespIEs); strConnectInfo.pu8RespIEs = NULL; - kfree(strConnectInfo.pu8ReqIEs); - strConnectInfo.pu8ReqIEs = NULL; + kfree(strConnectInfo.req_ies); + strConnectInfo.req_ies = NULL; hif_drv->usr_conn_req.ssid_len = 0; kfree(hif_drv->usr_conn_req.ssid); hif_drv->usr_conn_req.ssid = NULL; diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index 1605199..7260f1d 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -544,7 +544,7 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent, } cfg80211_connect_result(dev, pstrConnectInfo->bssid, - pstrConnectInfo->pu8ReqIEs, pstrConnectInfo->ReqIEsLen, + pstrConnectInfo->req_ies, pstrConnectInfo->ReqIEsLen, pstrConnectInfo->pu8RespIEs, pstrConnectInfo->u16RespIEsLen, u16ConnectStatus, GFP_KERNEL); } else if (enuConnDisconnEvent == CONN_DISCONN_EVENT_DISCONN_NOTIF) {