]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
staging: wilc1000: rename au8Duration of struct join_bss_param
authorLeo Kim <leo.kim@atmel.com>
Thu, 15 Oct 2015 04:24:48 +0000 (13:24 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 17 Oct 2015 04:37:18 +0000 (21:37 -0700)
This patch renames au8Duration of struct join_bss_param to duration
to avoid CamelCase naming convention.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/host_interface.c

index a4dcc4049577b754533b91b129b298eb80fcf59c..070dede37b03f1ac8894b2c72f13edf3c4c6b706 100644 (file)
@@ -224,7 +224,7 @@ struct join_bss_param {
        u8 ct_window;
        u8 cnt;
        u8 idx;
-       u8 au8Duration[4];
+       u8 duration[4];
        u8 au8Interval[4];
        u8 au8StartTime[4];
 };
@@ -1189,9 +1189,8 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
 
                *(pu8CurrByte++) = ptstrJoinBssParam->cnt;
 
-               memcpy(pu8CurrByte, ptstrJoinBssParam->au8Duration, sizeof(ptstrJoinBssParam->au8Duration));
-
-               pu8CurrByte += sizeof(ptstrJoinBssParam->au8Duration);
+               memcpy(pu8CurrByte, ptstrJoinBssParam->duration, sizeof(ptstrJoinBssParam->duration));
+               pu8CurrByte += sizeof(ptstrJoinBssParam->duration);
 
                memcpy(pu8CurrByte, ptstrJoinBssParam->au8Interval, sizeof(ptstrJoinBssParam->au8Interval));
 
@@ -4960,7 +4959,7 @@ static void *host_int_ParseJoinBssParam(tstrNetworkInfo *ptstrNetworkInfo)
                                pNewJoinBssParam->cnt = pu8IEs[index + 11];
                                u16P2P_count = index + 12;
 
-                               memcpy(pNewJoinBssParam->au8Duration, pu8IEs + u16P2P_count, 4);
+                               memcpy(pNewJoinBssParam->duration, pu8IEs + u16P2P_count, 4);
                                u16P2P_count += 4;
 
                                memcpy(pNewJoinBssParam->au8Interval, pu8IEs + u16P2P_count, 4);