diff options
-rw-r--r-- | drivers/staging/wilc1000/coreconfigurator.h | 3 | ||||
-rw-r--r-- | drivers/staging/wilc1000/host_interface.c | 11 |
2 files changed, 6 insertions, 8 deletions
diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h index f40d4582475b..45dce5b7ef97 100644 --- a/drivers/staging/wilc1000/coreconfigurator.h +++ b/drivers/staging/wilc1000/coreconfigurator.h @@ -125,8 +125,7 @@ s32 wilc_parse_network_info(u8 *msg_buffer, s32 wilc_parse_assoc_resp_info(u8 *buffer, u32 buffer_len, struct connect_resp_info **ret_connect_resp_info); void wilc_scan_complete_received(struct wilc *wilc, u8 *buffer, u32 length); -void wilc_network_info_received(struct wilc *wilc, u8 *pu8Buffer, - u32 u32Length); +void wilc_network_info_received(struct wilc *wilc, u8 *buffer, u32 length); void wilc_gnrl_async_info_received(struct wilc *wilc, u8 *pu8Buffer, u32 u32Length); #endif diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index dbf6b95e08b6..aafdf3b531f0 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -3439,8 +3439,7 @@ int wilc_deinit(struct wilc_vif *vif) return result; } -void wilc_network_info_received(struct wilc *wilc, u8 *pu8Buffer, - u32 u32Length) +void wilc_network_info_received(struct wilc *wilc, u8 *buffer, u32 length) { s32 result = 0; struct host_if_msg msg; @@ -3448,7 +3447,7 @@ void wilc_network_info_received(struct wilc *wilc, u8 *pu8Buffer, struct host_if_drv *hif_drv = NULL; struct wilc_vif *vif; - id = ((pu8Buffer[u32Length - 4]) | (pu8Buffer[u32Length - 3] << 8) | (pu8Buffer[u32Length - 2] << 16) | (pu8Buffer[u32Length - 1] << 24)); + id = ((buffer[length - 4]) | (buffer[length - 3] << 8) | (buffer[length - 2] << 16) | (buffer[length - 1] << 24)); vif = wilc_get_vif_from_idx(wilc, id); if (!vif) return; @@ -3464,9 +3463,9 @@ void wilc_network_info_received(struct wilc *wilc, u8 *pu8Buffer, msg.id = HOST_IF_MSG_RCVD_NTWRK_INFO; msg.vif = vif; - msg.body.net_info.len = u32Length; - msg.body.net_info.buffer = kmalloc(u32Length, GFP_KERNEL); - memcpy(msg.body.net_info.buffer, pu8Buffer, u32Length); + msg.body.net_info.len = length; + msg.body.net_info.buffer = kmalloc(length, GFP_KERNEL); + memcpy(msg.body.net_info.buffer, buffer, length); result = wilc_enqueue_cmd(&msg); if (result) |