From patchwork Mon Oct 26 00:44:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaehyun Lim X-Patchwork-Id: 7484451 X-Patchwork-Delegate: kvalo@adurom.com 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 48429BEEA4 for ; Mon, 26 Oct 2015 00:45:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5F688207E3 for ; Mon, 26 Oct 2015 00:45:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 55978207DD for ; Mon, 26 Oct 2015 00:45:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752621AbbJZApG (ORCPT ); Sun, 25 Oct 2015 20:45:06 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:36262 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752252AbbJZApE (ORCPT ); Sun, 25 Oct 2015 20:45:04 -0400 Received: by pacfv9 with SMTP id fv9so177827259pac.3 for ; Sun, 25 Oct 2015 17:45:04 -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=MJ/5yyPUCzIMwrtOH/f7SzwztSXG3wOpRMzqeV0AH08=; b=F4aLEm32HVh0AgErPcoHesjBlSoa6sGCO7O9/P2e5Q6cMAcxruRxjjHfQm9JeyFavZ 37StbtC3nwFhDvOqrjpcLzfNp9YgE0cri75hJQdFK5wtDGOOK/yzguxcE8TiKXWeBOmU tsYEknNz8tBJoKaxuFADW4fdN3dsC2oCS/upHfoelYNG2YLVEib2WyhtgRn691ojIzrG JupGUn/rEZkZvyjUviI69UnJk4HelYQPVrnIPZ3fTCsT+qElvuwOHrKhiJNdXcsF/lsz wPL7/ibKsuW/1DeIxE0+JvPacvvXJYuQ4ALG3I3YgyE6pgMtoMuKL/6rn5eCYzd6kMM5 Ipaw== X-Received: by 10.66.124.165 with SMTP id mj5mr3869394pab.58.1445820304419; Sun, 25 Oct 2015 17:45:04 -0700 (PDT) Received: from localhost.localdomain ([218.233.16.2]) by smtp.gmail.com with ESMTPSA id rz9sm30428808pbb.61.2015.10.25.17.45.01 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 25 Oct 2015 17:45:03 -0700 (PDT) From: Chaehyun Lim To: gregkh@linuxfoundation.org Cc: johnny.kim@atmel.com, rachel.kim@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 4/4] staging: wilc1000: rename host_int_set_WEPDefaultKeyID Date: Mon, 26 Oct 2015 09:44:45 +0900 Message-Id: <1445820285-14433-4-git-send-email-chaehyun.lim@gmail.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1445820285-14433-1-git-send-email-chaehyun.lim@gmail.com> References: <1445820285-14433-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 replaces host_int_set_WEPDefaultKeyID with host_int_set_wep_default_key to avoid camelcase. Signed-off-by: Chaehyun Lim --- drivers/staging/wilc1000/host_interface.c | 2 +- drivers/staging/wilc1000/host_interface.h | 2 +- drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 4f1af61..e5ffe52 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -3128,7 +3128,7 @@ int host_int_remove_wep_key(struct host_if_drv *hif_drv, u8 index) return result; } -int host_int_set_WEPDefaultKeyID(struct host_if_drv *hif_drv, u8 index) +int host_int_set_wep_default_key(struct host_if_drv *hif_drv, u8 index) { int result = 0; struct host_if_msg msg; diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index ea91bbf..f3fb628 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -384,7 +384,7 @@ int host_int_remove_wep_key(struct host_if_drv *wfi_drv, u8 index); * @date 8 March 2012 * @version 1.0 */ -int host_int_set_WEPDefaultKeyID(struct host_if_drv *hif_drv, u8 index); +int host_int_set_wep_default_key(struct host_if_drv *hif_drv, u8 index); /** * @brief sets WEP deafault key diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index 5559aa6..ac32d2b 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -892,7 +892,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, g_key_wep_params.key_idx = sme->key_idx; g_wep_keys_saved = true; - host_int_set_WEPDefaultKeyID(priv->hWILCWFIDrv, sme->key_idx); + host_int_set_wep_default_key(priv->hWILCWFIDrv, sme->key_idx); host_int_add_wep_key_bss_sta(priv->hWILCWFIDrv, sme->key, sme->key_len, sme->key_idx); } else if (sme->crypto.cipher_group == WLAN_CIPHER_SUITE_WEP104) { u8security = ENCRYPT_ENABLED | WEP | WEP_EXTENDED; @@ -909,7 +909,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, g_key_wep_params.key_idx = sme->key_idx; g_wep_keys_saved = true; - host_int_set_WEPDefaultKeyID(priv->hWILCWFIDrv, sme->key_idx); + host_int_set_wep_default_key(priv->hWILCWFIDrv, sme->key_idx); host_int_add_wep_key_bss_sta(priv->hWILCWFIDrv, sme->key, sme->key_len, sme->key_idx); } else if (sme->crypto.wpa_versions & NL80211_WPA_VERSION_2) { if (sme->crypto.cipher_group == WLAN_CIPHER_SUITE_TKIP) { @@ -1502,7 +1502,7 @@ static int set_default_key(struct wiphy *wiphy, struct net_device *netdev, u8 ke if (key_index != priv->WILC_WFI_wep_default) { - host_int_set_WEPDefaultKeyID(priv->hWILCWFIDrv, key_index); + host_int_set_wep_default_key(priv->hWILCWFIDrv, key_index); } return 0; @@ -2605,7 +2605,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, /*Add saved WEP keys, if any*/ if (g_wep_keys_saved) { - host_int_set_WEPDefaultKeyID(wl->vif[0].hif_drv, + host_int_set_wep_default_key(wl->vif[0].hif_drv, g_key_wep_params.key_idx); host_int_add_wep_key_bss_sta(wl->vif[0].hif_drv, g_key_wep_params.key, @@ -2687,7 +2687,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, /*Add saved WEP keys, if any*/ if (g_wep_keys_saved) { - host_int_set_WEPDefaultKeyID(wl->vif[0].hif_drv, + host_int_set_wep_default_key(wl->vif[0].hif_drv, g_key_wep_params.key_idx); host_int_add_wep_key_bss_sta(wl->vif[0].hif_drv, g_key_wep_params.key, @@ -2803,7 +2803,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, /*Add saved WEP keys, if any*/ if (g_wep_keys_saved) { - host_int_set_WEPDefaultKeyID(wl->vif[0].hif_drv, + host_int_set_wep_default_key(wl->vif[0].hif_drv, g_key_wep_params.key_idx); host_int_add_wep_key_bss_sta(wl->vif[0].hif_drv, g_key_wep_params.key,