From patchwork Thu Oct 8 09:10:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Cho X-Patchwork-Id: 7350671 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 50F6C9F32B for ; Thu, 8 Oct 2015 09:12:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 59A1A2064F for ; Thu, 8 Oct 2015 09:12:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 477AB205F1 for ; Thu, 8 Oct 2015 09:12:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755171AbbJHJML (ORCPT ); Thu, 8 Oct 2015 05:12:11 -0400 Received: from eusmtp01.atmel.com ([212.144.249.243]:38255 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754798AbbJHJMK (ORCPT ); Thu, 8 Oct 2015 05:12:10 -0400 Received: from tony-itx.corp.atmel.com (10.161.101.13) by eusmtp01.atmel.com (10.161.101.31) with Microsoft SMTP Server id 14.3.235.1; Thu, 8 Oct 2015 11:12:04 +0200 From: Tony Cho To: CC: , , , , , , , , , , , Subject: [PATCH 09/11] staging: wilc1000: rename u8Wepidx of struct host_if_wep_attr Date: Thu, 8 Oct 2015 18:10:54 +0900 Message-ID: <1444295456-25818-9-git-send-email-tony.cho@atmel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1444295456-25818-1-git-send-email-tony.cho@atmel.com> References: <1444295456-25818-1-git-send-email-tony.cho@atmel.com> MIME-Version: 1.0 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 u8Wepidx of struct host_if_wep_attr to index to avoid CamelCase naming convention. Signed-off-by: Tony Cho --- drivers/staging/wilc1000/host_interface.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 7919851..e99db7d 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -109,7 +109,7 @@ struct host_if_wpa_attr { struct host_if_wep_attr { u8 *key; u8 key_len; - u8 u8Wepidx; + u8 index; u8 u8mode; enum AUTHTYPE tenuAuth_type; }; @@ -2350,7 +2350,7 @@ static int Handle_Key(struct host_if_drv *hif_drv, if (pstrHostIFkeyAttr->u8KeyAction & ADDKEY_AP) { PRINT_D(HOSTINF_DBG, "Handling WEP key\n"); - PRINT_D(GENERIC_DBG, "ID Hostint is %d\n", (pstrHostIFkeyAttr->uniHostIFkeyAttr.wep.u8Wepidx)); + PRINT_D(GENERIC_DBG, "ID Hostint is %d\n", (pstrHostIFkeyAttr->uniHostIFkeyAttr.wep.index)); strWIDList[0].id = (u16)WID_11I_MODE; strWIDList[0].type = WID_CHAR; strWIDList[0].size = sizeof(char); @@ -2364,7 +2364,7 @@ static int Handle_Key(struct host_if_drv *hif_drv, strWIDList[2].id = (u16)WID_KEY_ID; strWIDList[2].type = WID_CHAR; - strWIDList[2].val = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.wep.u8Wepidx)); + strWIDList[2].val = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.wep.index)); strWIDList[2].size = sizeof(char); @@ -2402,7 +2402,7 @@ static int Handle_Key(struct host_if_drv *hif_drv, PRINT_ER("No buffer to send Key\n"); return -1; } - pu8keybuf[0] = pstrHostIFkeyAttr->uniHostIFkeyAttr.wep.u8Wepidx; + pu8keybuf[0] = pstrHostIFkeyAttr->uniHostIFkeyAttr.wep.index; memcpy(pu8keybuf + 1, &pstrHostIFkeyAttr->uniHostIFkeyAttr.wep.key_len, 1); @@ -2425,7 +2425,7 @@ static int Handle_Key(struct host_if_drv *hif_drv, strWID.id = (u16)WID_REMOVE_WEP_KEY; strWID.type = WID_STR; - s8idxarray[0] = (s8)pstrHostIFkeyAttr->uniHostIFkeyAttr.wep.u8Wepidx; + s8idxarray[0] = (s8)pstrHostIFkeyAttr->uniHostIFkeyAttr.wep.index; strWID.val = s8idxarray; strWID.size = 1; @@ -2434,7 +2434,7 @@ static int Handle_Key(struct host_if_drv *hif_drv, } else { strWID.id = (u16)WID_KEY_ID; strWID.type = WID_CHAR; - strWID.val = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.wep.u8Wepidx)); + strWID.val = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.wep.index)); strWID.size = sizeof(char); PRINT_D(HOSTINF_DBG, "Setting default key index\n"); @@ -4099,7 +4099,7 @@ s32 host_int_remove_wep_key(struct host_if_drv *hif_drv, u8 u8keyIdx) - msg.body.key_info.uniHostIFkeyAttr.wep.u8Wepidx = u8keyIdx; + msg.body.key_info.uniHostIFkeyAttr.wep.index = u8keyIdx; /* send the message */ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg)); @@ -4144,7 +4144,7 @@ s32 host_int_set_WEPDefaultKeyID(struct host_if_drv *hif_drv, u8 u8Index) msg.drv = hif_drv; - msg.body.key_info.uniHostIFkeyAttr.wep.u8Wepidx = u8Index; + msg.body.key_info.uniHostIFkeyAttr.wep.index = u8Index; /* send the message */ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg)); @@ -4208,7 +4208,7 @@ s32 host_int_add_wep_key_bss_sta(struct host_if_drv *hif_drv, msg.body.key_info.uniHostIFkeyAttr.wep.key_len = (u8WepKeylen); - msg.body.key_info.uniHostIFkeyAttr.wep.u8Wepidx = u8Keyidx; + msg.body.key_info.uniHostIFkeyAttr.wep.index = u8Keyidx; /* send the message */ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg)); @@ -4277,7 +4277,7 @@ s32 host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv, msg.body.key_info.uniHostIFkeyAttr.wep.key_len = (u8WepKeylen); - msg.body.key_info.uniHostIFkeyAttr.wep.u8Wepidx = u8Keyidx; + msg.body.key_info.uniHostIFkeyAttr.wep.index = u8Keyidx; msg.body.key_info.uniHostIFkeyAttr.wep.u8mode = u8mode;