]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: wilc1000: rename u32Interval of struct beacon_attr
authorLeo Kim <leo.kim@atmel.com>
Tue, 13 Oct 2015 10:50:03 +0000 (19:50 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 13 Oct 2015 16:55:08 +0000 (09:55 -0700)
This patch renames u32Interval of struct beacon_attr to interval 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 cd4236413d4189b9271ab55fc64ed00acfe71140..e6490ef5bd1aa2c6bf2da2d9e1c02103ecf887c8 100644 (file)
@@ -131,7 +131,7 @@ struct channel_attr {
 };
 
 struct beacon_attr {
-       u32 u32Interval;
+       u32 interval;
        u32 u32DTIMPeriod;
        u32 u32HeadLen;
        u8 *pu8Head;
@@ -2344,10 +2344,10 @@ static void Handle_AddBeacon(struct host_if_drv *hif_drv,
                goto ERRORHANDLER;
 
        pu8CurrByte = strWID.val;
-       *pu8CurrByte++ = (pstrSetBeaconParam->u32Interval & 0xFF);
-       *pu8CurrByte++ = ((pstrSetBeaconParam->u32Interval >> 8) & 0xFF);
-       *pu8CurrByte++ = ((pstrSetBeaconParam->u32Interval >> 16) & 0xFF);
-       *pu8CurrByte++ = ((pstrSetBeaconParam->u32Interval >> 24) & 0xFF);
+       *pu8CurrByte++ = (pstrSetBeaconParam->interval & 0xFF);
+       *pu8CurrByte++ = ((pstrSetBeaconParam->interval >> 8) & 0xFF);
+       *pu8CurrByte++ = ((pstrSetBeaconParam->interval >> 16) & 0xFF);
+       *pu8CurrByte++ = ((pstrSetBeaconParam->interval >> 24) & 0xFF);
 
        *pu8CurrByte++ = (pstrSetBeaconParam->u32DTIMPeriod & 0xFF);
        *pu8CurrByte++ = ((pstrSetBeaconParam->u32DTIMPeriod >> 8) & 0xFF);
@@ -4641,7 +4641,7 @@ s32 host_int_add_beacon(struct host_if_drv *hif_drv, u32 u32Interval,
 
        msg.id = HOST_IF_MSG_ADD_BEACON;
        msg.drv = hif_drv;
-       pstrSetBeaconParam->u32Interval = u32Interval;
+       pstrSetBeaconParam->interval = u32Interval;
        pstrSetBeaconParam->u32DTIMPeriod = u32DTIMPeriod;
        pstrSetBeaconParam->u32HeadLen = u32HeadLen;
        pstrSetBeaconParam->pu8Head = kmalloc(u32HeadLen, GFP_KERNEL);