From patchwork Tue Dec 22 00:48:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaehyun Lim X-Patchwork-Id: 7899681 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 263479F318 for ; Tue, 22 Dec 2015 00:49:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4F106205BE for ; Tue, 22 Dec 2015 00:49:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 723A5205BD for ; Tue, 22 Dec 2015 00:49:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751827AbbLVAtY (ORCPT ); Mon, 21 Dec 2015 19:49:24 -0500 Received: from mail-pf0-f170.google.com ([209.85.192.170]:36143 "EHLO mail-pf0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751530AbbLVAtX (ORCPT ); Mon, 21 Dec 2015 19:49:23 -0500 Received: by mail-pf0-f170.google.com with SMTP id o64so96677732pfb.3 for ; Mon, 21 Dec 2015 16:49:23 -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=YOZc1gEGusLyQOKtpve8SPvBT3kMC8SGUVAQ6LvwZSg=; b=FIpn2iIBRjjqGzgXGt5Pyt95ZzjeWu9FE+a7Yv1Ne6gMBGskWSlvrdICLIGdr9ZDv9 UYInGMZukW2tFx/zK5yI5GGXpxjIeGAlRiz/IyZb/AB7Wyfr8avTCue+UiR/56O02THb 84OSys0zB7ksEeQSfpajCCRDFWy2sEQWFNQzEe64XRMSPLpY5pdLeYOAJgYTwWqA9YZt p2n0GWvZkI6yOOijB+leoaBqHg+Wi6N7A8TqINs7E8/8WdQNZabWYO1pfBQA/I+4NA/J aQBaJdZtFW+qHgB/Bd8QYNM646f/OSD2yIrd86eyZhq37qrTBtZ62hL9gDNNM6SegRxk P1lw== X-Received: by 10.98.71.18 with SMTP id u18mr31100877pfa.107.1450745362852; Mon, 21 Dec 2015 16:49:22 -0800 (PST) Received: from localhost.localdomain ([218.233.16.2]) by smtp.gmail.com with ESMTPSA id sv8sm41742573pab.13.2015.12.21.16.49.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Dec 2015 16:49:22 -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 03/13] staging: wilc1000: fix return type of wilc_add_rx_gtk declaration Date: Tue, 22 Dec 2015 09:48:59 +0900 Message-Id: <1450745349-16811-3-git-send-email-chaehyun.lim@gmail.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1450745349-16811-1-git-send-email-chaehyun.lim@gmail.com> References: <1450745349-16811-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 changes return type of wilc_add_rx_gtk declaration from s32 to int. The return type of this function declaration and definition should be same as data type of int. Signed-off-by: Chaehyun Lim --- drivers/staging/wilc1000/host_interface.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index 7e89776..02c10171 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -317,7 +317,7 @@ int wilc_add_ptk(struct wilc_vif *vif, const u8 *ptk, u8 ptk_key_len, u8 mode, u8 cipher_mode, u8 index); s32 wilc_get_inactive_time(struct wilc_vif *vif, const u8 *mac, u32 *pu32InactiveTime); -s32 wilc_add_rx_gtk(struct wilc_vif *vif, const u8 *pu8RxGtk, u8 u8GtkKeylen, +int wilc_add_rx_gtk(struct wilc_vif *vif, const u8 *pu8RxGtk, u8 u8GtkKeylen, u8 u8KeyIdx, u32 u32KeyRSClen, const u8 *KeyRSC, const u8 *pu8RxMic, const u8 *pu8TxMic, u8 mode, u8 u8Ciphermode);