From: Leo Kim Date: Thu, 15 Oct 2015 04:24:44 +0000 (+0900) Subject: staging: wilc1000: rename u8OppEnable of struct join_bss_param X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d72b33caee4763d28f5e11cc230ff50b96698582;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git staging: wilc1000: rename u8OppEnable of struct join_bss_param This patch renames u8OppEnable of struct join_bss_param to opp_enabled to avoid CamelCase naming convention. Signed-off-by: Leo Kim Signed-off-by: Tony Cho Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index ee86a69a1fcd..7c6560942e3d 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -220,7 +220,7 @@ struct join_bss_param { u8 rsn_cap[2]; u32 tsf; u8 noa_enabled; - u8 u8OppEnable; + u8 opp_enabled; u8 u8CtWindow; u8 u8Count; u8 u8Index; @@ -1182,10 +1182,9 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv, *(pu8CurrByte++) = ((ptstrJoinBssParam->tsf) >> 24) & 0xFF; *(pu8CurrByte++) = ptstrJoinBssParam->u8Index; + *(pu8CurrByte++) = ptstrJoinBssParam->opp_enabled; - *(pu8CurrByte++) = ptstrJoinBssParam->u8OppEnable; - - if (ptstrJoinBssParam->u8OppEnable) + if (ptstrJoinBssParam->opp_enabled) *(pu8CurrByte++) = ptstrJoinBssParam->u8CtWindow; *(pu8CurrByte++) = ptstrJoinBssParam->u8Count; @@ -4948,10 +4947,11 @@ static void *host_int_ParseJoinBssParam(tstrNetworkInfo *ptstrNetworkInfo) pNewJoinBssParam->u8Index = pu8IEs[index + 9]; if (pu8IEs[index + 10] & BIT(7)) { - pNewJoinBssParam->u8OppEnable = 1; + pNewJoinBssParam->opp_enabled = 1; pNewJoinBssParam->u8CtWindow = pu8IEs[index + 10]; - } else - pNewJoinBssParam->u8OppEnable = 0; + } else { + pNewJoinBssParam->opp_enabled = 0; + } PRINT_D(GENERIC_DBG, "P2P Dump\n"); for (i = 0; i < pu8IEs[index + 7]; i++)