From patchwork Thu Sep 10 19:14:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaehyun Lim X-Patchwork-Id: 7155371 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 94FC79F695 for ; Thu, 10 Sep 2015 19:14:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9F1AA20844 for ; Thu, 10 Sep 2015 19:14:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7BF4120871 for ; Thu, 10 Sep 2015 19:14:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753287AbbIJTOz (ORCPT ); Thu, 10 Sep 2015 15:14:55 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:33857 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752256AbbIJTOy (ORCPT ); Thu, 10 Sep 2015 15:14:54 -0400 Received: by padhy16 with SMTP id hy16so50949080pad.1 for ; Thu, 10 Sep 2015 12:14:54 -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=B7YM1ReuN/LIxPoptMEt9CjC4FjtAI02RUh4Qys4mSI=; b=Ce596lfhlm4qwILVgNtJew0aVXT7aZ/DqXpbpgao0ElfS/gMpcJKh9jhY4RTYP6u7r /9sU8pnED5NjFcAjHUozShhW77uD5v5K0l4Q3qalK5Cu4AW2zm5/Dwrag1m2l5w6Gn/o hk8ruP+xO/SOLwwVpmdt1ByFI3/cliWecqcs35u9pdNzXE9oiaiGICZH9wHe5eC/wnEv 65v3YufO1c9uWKQCPAvC0iJR7VTBQk390ndvUGY1vdTCAsVWAgGtSy1IdQ0GLiCXAQXK nYufBHDisyoaXL8auPidfHmB07+LeoakedqAquYQ/e6LkOjq9d4e9BnSgXFrslmJmgdR pyCw== X-Received: by 10.66.142.233 with SMTP id rz9mr76110989pab.23.1441912494413; Thu, 10 Sep 2015 12:14:54 -0700 (PDT) Received: from localhost.localdomain ([218.233.16.2]) by smtp.gmail.com with ESMTPSA id ki3sm13473724pbc.9.2015.09.10.12.14.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Sep 2015 12:14:54 -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 V2 05/31] staging: wilc1000: rename WILC_WFI_add_key Date: Fri, 11 Sep 2015 04:14:04 +0900 Message-Id: <1441912470-3371-5-git-send-email-chaehyun.lim@gmail.com> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1441912470-3371-1-git-send-email-chaehyun.lim@gmail.com> References: <1441912470-3371-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 replaces WILC_WFI_add_key with wilc_add_key to avoid CamelCase. Signed-off-by: Chaehyun Lim --- V2: to make function name simple drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index e301372..db327f7 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -1112,7 +1112,7 @@ static int wilc_disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reas } /** - * @brief WILC_WFI_add_key + * @brief wilc_add_key * @details Add a key with the given parameters. @mac_addr will be %NULL * when adding a group key. * @param[in] key : key buffer; TKIP: 16-byte temporal key, 8-byte Tx Mic key, 8-byte Rx Mic Key @@ -1121,9 +1121,9 @@ static int wilc_disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reas * @date 01 MAR 2012 * @version 1.0 */ -static int WILC_WFI_add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, - bool pairwise, - const u8 *mac_addr, struct key_params *params) +static int wilc_add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, + bool pairwise, + const u8 *mac_addr, struct key_params *params) { s32 s32Error = WILC_SUCCESS, KeyLen = params->key_len; @@ -2933,14 +2933,14 @@ static int WILC_WFI_change_virt_intf(struct wiphy *wiphy, struct net_device *dev PRINT_D(CFG80211_DBG, "gtk %x %x %x\n", g_key_gtk_params.key[0], g_key_gtk_params.key[1], g_key_gtk_params.key[2]); - WILC_WFI_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy, + wilc_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy, g_linux_wlan->strInterfaceInfo[0].wilc_netdev, g_add_ptk_key_params.key_idx, g_add_ptk_key_params.pairwise, g_add_ptk_key_params.mac_addr, (struct key_params *)(&g_key_ptk_params)); - WILC_WFI_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy, + wilc_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy, g_linux_wlan->strInterfaceInfo[0].wilc_netdev, g_add_gtk_key_params.key_idx, g_add_gtk_key_params.pairwise, @@ -3019,14 +3019,14 @@ static int WILC_WFI_change_virt_intf(struct wiphy *wiphy, struct net_device *dev PRINT_D(CFG80211_DBG, "gtk %x %x %x\n", g_key_gtk_params.key[0], g_key_gtk_params.key[1], g_key_gtk_params.key[2]); - WILC_WFI_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy, + wilc_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy, g_linux_wlan->strInterfaceInfo[0].wilc_netdev, g_add_ptk_key_params.key_idx, g_add_ptk_key_params.pairwise, g_add_ptk_key_params.mac_addr, (struct key_params *)(&g_key_ptk_params)); - WILC_WFI_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy, + wilc_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy, g_linux_wlan->strInterfaceInfo[0].wilc_netdev, g_add_gtk_key_params.key_idx, g_add_gtk_key_params.pairwise, @@ -3150,14 +3150,14 @@ static int WILC_WFI_change_virt_intf(struct wiphy *wiphy, struct net_device *dev g_key_gtk_params.key[2], g_key_gtk_params.cipher); #if 1 - WILC_WFI_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy, + wilc_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy, g_linux_wlan->strInterfaceInfo[0].wilc_netdev, g_add_ptk_key_params.key_idx, g_add_ptk_key_params.pairwise, g_add_ptk_key_params.mac_addr, (struct key_params *)(&g_key_ptk_params)); - WILC_WFI_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy, + wilc_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy, g_linux_wlan->strInterfaceInfo[0].wilc_netdev, g_add_gtk_key_params.key_idx, g_add_gtk_key_params.pairwise, @@ -3562,7 +3562,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = { .scan = wilc_scan, .connect = wilc_connect, .disconnect = wilc_disconnect, - .add_key = WILC_WFI_add_key, + .add_key = wilc_add_key, .del_key = WILC_WFI_del_key, .get_key = WILC_WFI_get_key, .set_default_key = WILC_WFI_set_default_key,