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

Commit e16aed64 authored Dec 24, 2015 by Chaehyun Lim Committed by Greg Kroah-Hartman Feb 03, 2016

staging: wilc1000: fix return type of wilc_get_rssi



This patch changes return type of wilc_get_rssi 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>

parent a5f9943c

drivers/staging/wilc1000/host_interface.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3628,9 +3628,9 @@ s32 wilc_get_inactive_time(struct wilc_vif vif, const u8 mac,
	return result;		return result;
	}		}

	s32 wilc_get_rssi(struct wilc_vif vif, s8 ps8Rssi)		int wilc_get_rssi(struct wilc_vif vif, s8 ps8Rssi)
	{		{
	s32 result = 0;		int result = 0;
	struct host_if_msg msg;		struct host_if_msg msg;
	struct host_if_drv *hif_drv = vif->hif_drv;		struct host_if_drv *hif_drv = vif->hif_drv;

drivers/staging/wilc1000/host_interface.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -334,7 +334,7 @@ int wilc_set_join_req(struct wilc_vif vif, u8 bssid, const u8 *ssid,
	int wilc_flush_join_req(struct wilc_vif *vif);		int wilc_flush_join_req(struct wilc_vif *vif);
	int wilc_disconnect(struct wilc_vif *vif, u16 reason_code);		int wilc_disconnect(struct wilc_vif *vif, u16 reason_code);
	int wilc_set_mac_chnl_num(struct wilc_vif *vif, u8 channel);		int wilc_set_mac_chnl_num(struct wilc_vif *vif, u8 channel);
	s32 wilc_get_rssi(struct wilc_vif vif, s8 ps8Rssi);		int wilc_get_rssi(struct wilc_vif vif, s8 ps8Rssi);
	s32 wilc_scan(struct wilc_vif *vif, u8 u8ScanSource, u8 u8ScanType,		s32 wilc_scan(struct wilc_vif *vif, u8 u8ScanSource, u8 u8ScanType,
	u8 pu8ChnlFreqList, u8 u8ChnlListLen, const u8 pu8IEs,		u8 pu8ChnlFreqList, u8 u8ChnlListLen, const u8 pu8IEs,
	size_t IEsLen, wilc_scan_result ScanResult, void *pvUserArg,		size_t IEsLen, wilc_scan_result ScanResult, void *pvUserArg,