From patchwork Thu Feb 25 00:15:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaehyun Lim X-Patchwork-Id: 8415321 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 554009F2F0 for ; Thu, 25 Feb 2016 00:16:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 58041202EB for ; Thu, 25 Feb 2016 00:16:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 51230202E6 for ; Thu, 25 Feb 2016 00:16:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758638AbcBYAQW (ORCPT ); Wed, 24 Feb 2016 19:16:22 -0500 Received: from mail-pf0-f177.google.com ([209.85.192.177]:34697 "EHLO mail-pf0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757428AbcBYAQT (ORCPT ); Wed, 24 Feb 2016 19:16:19 -0500 Received: by mail-pf0-f177.google.com with SMTP id x65so21962398pfb.1 for ; Wed, 24 Feb 2016 16:16:18 -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=GyCC8iwyDlv22/t+EQccY4UAPOBJ9baEn6UDgqhLuew=; b=mv557I3eRyZDwSxeiXBDFjqXGDeo0QMr0WCvHUEy3V0i9+OEZkRLTe/iI83scPZdzV SHLkqM2w/Lx3uKwgtZzeWlidoIBma70Awgo2TenIUkdGe4kDJERALmE5TzHQUqMSVqKJ 112z81coUIQU48zb1bbG8kDhyAFEjI1jLzY0CnxKQ4dOuUVHaf3NHwEvNy8sQy6uP6v4 4x30S7AS8QZtnvK93qFEiKSqaci6ztCRomWflqoc3A96q08rPdMOp48sS9uQEKH52gRU NkWA6fcdktMZFhTxyvVWOyNfsrsca2eItkxjeyiQxIznz6FVRnwA7cJ4DSCV0XP3/8ll u2fA== 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=GyCC8iwyDlv22/t+EQccY4UAPOBJ9baEn6UDgqhLuew=; b=WRpNwfSYR1/pcRbDRc+m5Tx+if/o86VpVvPz+v03EgpRpsCfzmzYkSBuhy011OEVrA ze1JS++5gWTjPrTxSmK9bsJoiQq3THjKvRrt35EyQ37r0U9QXfbM7/AVXmK8c1ZTlD7L rjQ62veQKkddp9w3F53Frtwb6Bua/AQlK6E2DbrFFsMzldJIHnFoir0YbRcTjkZz4hoz EwH5QEEykPLtCy8UZNxI8kfln7uJR1wUQ24UY7FTaOLm773iISvm5CXqCrzdcgqbgbRr CwUX+k7pQd7ypHIrdlB8T8IbC2Wj6sabt0gxbc9qn77jhFSxq0F0bB5bn1DNB6+KAbd+ YH+w== X-Gm-Message-State: AG10YOS5vuN2sFN7vJj4rdSBjqukyTz0nvv1e3JSnbPaXMN3b9Ws6mTwaPNyUJvvSgkuwQ== X-Received: by 10.98.31.221 with SMTP id l90mr58886178pfj.92.1456359378241; Wed, 24 Feb 2016 16:16:18 -0800 (PST) Received: from localhost.localdomain ([218.233.16.2]) by smtp.gmail.com with ESMTPSA id h66sm7476150pfd.91.2016.02.24.16.16.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 Feb 2016 16:16:17 -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 7/9] staging: wilc1000: rename u16ConnectStatus in struct connect_info Date: Thu, 25 Feb 2016 09:15:48 +0900 Message-Id: <1456359350-17118-7-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 u16ConnectStatus to status to avoid camelcase. Signed-off-by: Chaehyun Lim --- drivers/staging/wilc1000/coreconfigurator.h | 2 +- drivers/staging/wilc1000/host_interface.c | 10 +++++----- drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h index 408031f..9fbd52b 100644 --- a/drivers/staging/wilc1000/coreconfigurator.h +++ b/drivers/staging/wilc1000/coreconfigurator.h @@ -111,7 +111,7 @@ struct connect_info { size_t req_ies_len; u8 *resp_ies; u16 resp_ies_len; - u16 u16ConnectStatus; + u16 status; }; typedef struct { diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 58902bf..1ebe08a 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -1463,9 +1463,9 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif, if (s32Err) { netdev_err(vif->ndev, "wilc_parse_assoc_resp_info() returned error %d\n", s32Err); } else { - strConnectInfo.u16ConnectStatus = pstrConnectRespInfo->status; + strConnectInfo.status = pstrConnectRespInfo->status; - if (strConnectInfo.u16ConnectStatus == SUCCESSFUL_STATUSCODE) { + if (strConnectInfo.status == SUCCESSFUL_STATUSCODE) { if (pstrConnectRespInfo->ies) { strConnectInfo.resp_ies_len = pstrConnectRespInfo->ies_len; strConnectInfo.resp_ies = kmalloc(pstrConnectRespInfo->ies_len, GFP_KERNEL); @@ -1483,7 +1483,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif, } if ((u8MacStatus == MAC_CONNECTED) && - (strConnectInfo.u16ConnectStatus != SUCCESSFUL_STATUSCODE)) { + (strConnectInfo.status != SUCCESSFUL_STATUSCODE)) { netdev_err(vif->ndev, "Received MAC status is MAC_CONNECTED while the received status code in Asoc Resp is not SUCCESSFUL_STATUSCODE\n"); eth_zero_addr(wilc_connected_ssid); } else if (u8MacStatus == MAC_DISCONNECTED) { @@ -1495,7 +1495,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif, memcpy(strConnectInfo.bssid, hif_drv->usr_conn_req.bssid, 6); if ((u8MacStatus == MAC_CONNECTED) && - (strConnectInfo.u16ConnectStatus == SUCCESSFUL_STATUSCODE)) { + (strConnectInfo.status == SUCCESSFUL_STATUSCODE)) { memcpy(hif_drv->assoc_bssid, hif_drv->usr_conn_req.bssid, ETH_ALEN); } @@ -1517,7 +1517,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif, hif_drv->usr_conn_req.arg); if ((u8MacStatus == MAC_CONNECTED) && - (strConnectInfo.u16ConnectStatus == SUCCESSFUL_STATUSCODE)) { + (strConnectInfo.status == SUCCESSFUL_STATUSCODE)) { wilc_set_power_mgmt(vif, 0, 0); hif_drv->hif_state = HOST_IF_CONNECTED; diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index 1dbeca5..c492423 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -502,10 +502,10 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent, if (enuConnDisconnEvent == CONN_DISCONN_EVENT_CONN_RESP) { u16 u16ConnectStatus; - u16ConnectStatus = pstrConnectInfo->u16ConnectStatus; + u16ConnectStatus = pstrConnectInfo->status; if ((u8MacStatus == MAC_DISCONNECTED) && - (pstrConnectInfo->u16ConnectStatus == SUCCESSFUL_STATUSCODE)) { + (pstrConnectInfo->status == SUCCESSFUL_STATUSCODE)) { u16ConnectStatus = WLAN_STATUS_UNSPECIFIED_FAILURE; wilc_wlan_set_bssid(priv->dev, NullBssid, STATION_MODE);