OSDN Git Service

staging: wilc1000: fix return type of host_int_add_rx_gtk
authorChaehyun Lim <chaehyun.lim@gmail.com>
Sun, 8 Nov 2015 07:49:05 +0000 (16:49 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Dec 2015 22:14:03 +0000 (14:14 -0800)
This patch changes return type of host_int_add_rx_gtk from s32 to int.
The result variable gets return value from wilc_mq_send that has return
type of int. It should be changed return type of this function as well
as data type of result variable.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/host_interface.c
drivers/staging/wilc1000/host_interface.h

index 18623c7..12b3f1d 100644 (file)
@@ -3273,13 +3273,13 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
        return result;
 }
 
-s32 host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *pu8RxGtk,
+int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *pu8RxGtk,
                        u8 u8GtkKeylen, u8 u8KeyIdx,
                        u32 u32KeyRSClen, const u8 *KeyRSC,
                        const u8 *pu8RxMic, const u8 *pu8TxMic,
                        u8 mode, u8 u8Ciphermode)
 {
-       s32 result = 0;
+       int result = 0;
        struct host_if_msg msg;
        u8 u8KeyLen = u8GtkKeylen;
 
index 9238315..2f10598 100644 (file)
@@ -317,7 +317,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
                     u8 mode, u8 cipher_mode, u8 index);
 s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac,
                               u32 *pu32InactiveTime);
-s32 host_int_add_rx_gtk(struct host_if_drv *hWFIDrv, const u8 *pu8RxGtk,
+int host_int_add_rx_gtk(struct host_if_drv *hWFIDrv, const u8 *pu8RxGtk,
                        u8 u8GtkKeylen, u8 u8KeyIdx,
                        u32 u32KeyRSClen, const u8 *KeyRSC,
                        const u8 *pu8RxMic, const u8 *pu8TxMic,