Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b477624 authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: fix return type of wilc_set_mac_address 



This patch changes return type of wilc_set_mac_address 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: default avatarChaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1eabfe3f

drivers/staging/wilc1000/host_interface.c

+2 −2
Original line number Diff line number Diff line
@@ -3346,9 +3346,9 @@ int wilc_get_mac_address(struct wilc_vif *vif, u8 *mac_addr) 
	return result;

}



s32 wilc_set_mac_address(struct wilc_vif *vif, u8 *pu8MacAddress)

int wilc_set_mac_address(struct wilc_vif *vif, u8 *pu8MacAddress)

{

	s32 result = 0;

	int result = 0;

	struct host_if_msg msg;



	PRINT_D(GENERIC_DBG, "mac addr = %x:%x:%x\n", pu8MacAddress[0], pu8MacAddress[1], pu8MacAddress[2]);

drivers/staging/wilc1000/host_interface.h

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ int wilc_add_rx_gtk(struct wilc_vif *vif, const u8 *rx_gtk, u8 gtk_key_len, 
int wilc_set_pmkid_info(struct wilc_vif *vif,

			struct host_if_pmkid_attr *pmkid);

int wilc_get_mac_address(struct wilc_vif *vif, u8 *mac_addr);

s32 wilc_set_mac_address(struct wilc_vif *vif, u8 *pu8MacAddress);

int wilc_set_mac_address(struct wilc_vif *vif, u8 *pu8MacAddress);

int wilc_wait_msg_queue_idle(void);

s32 wilc_set_join_req(struct wilc_vif *vif, u8 *pu8bssid, const u8 *pu8ssid,

		      size_t ssidLen, const u8 *pu8IEs, size_t IEsLen,