staging: wilc1000: rename u16FlagsMask of struct add_sta_param

This patch renames u16FlagsMask of struct add_sta_param to flags_mask
to avoid CamelCase naming convention.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 5a2e874d4d71e022131f1e44d50f6e5e0ba9eca9..258dabd24dd77961d56896f5c7646c81f9f4e3b3 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2339,8 +2339,8 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer,
 
        *pu8CurrByte++ = pstrStationParam->ht_ante_sel;
 
-       *pu8CurrByte++ = pstrStationParam->u16FlagsMask & 0xFF;
-       *pu8CurrByte++ = (pstrStationParam->u16FlagsMask >> 8) & 0xFF;
+       *pu8CurrByte++ = pstrStationParam->flags_mask & 0xFF;
+       *pu8CurrByte++ = (pstrStationParam->flags_mask >> 8) & 0xFF;
 
        *pu8CurrByte++ = pstrStationParam->u16FlagsSet & 0xFF;
        *pu8CurrByte++ = (pstrStationParam->u16FlagsSet >> 8) & 0xFF;

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 5ad0bfa84f00cb16a025bcfdb85940a33f7c4d79..1422b90b31731d2603b896ea22870cc943671862 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -299,7 +299,7 @@ struct add_sta_param {
        u16 ht_ext_params;
        u32 ht_tx_bf_cap;
        u8 ht_ante_sel;
-       u16 u16FlagsMask;
+       u16 flags_mask;
        u16 u16FlagsSet;
 };
 

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index a2c08783f4051a74392908f70effafc2b247cc02..0ae47c5c3a1687b13143eb2acebc9dabbd5a4ac4 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3023,7 +3023,7 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev,
                        strStaParams.ht_ante_sel = params->ht_capa->antenna_selection_info;
                }
 
-               strStaParams.u16FlagsMask = params->sta_flags_mask;
+               strStaParams.flags_mask = params->sta_flags_mask;
                strStaParams.u16FlagsSet = params->sta_flags_set;
 
                PRINT_D(HOSTAPD_DBG, "IS HT supported = %d\n",
@@ -3038,7 +3038,8 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev,
                        strStaParams.ht_tx_bf_cap);
                PRINT_D(HOSTAPD_DBG, "Antenna selection info = %d\n",
                        strStaParams.ht_ante_sel);
-               PRINT_D(HOSTAPD_DBG, "Flag Mask = %d\n", strStaParams.u16FlagsMask);
+               PRINT_D(HOSTAPD_DBG, "Flag Mask = %d\n",
+                       strStaParams.flags_mask);
                PRINT_D(HOSTAPD_DBG, "Flag Set = %d\n", strStaParams.u16FlagsSet);
 
                s32Error = host_int_add_station(priv->hWILCWFIDrv, &strStaParams);
@@ -3145,7 +3146,7 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev,
                        strStaParams.ht_ante_sel = params->ht_capa->antenna_selection_info;
                }
 
-               strStaParams.u16FlagsMask = params->sta_flags_mask;
+               strStaParams.flags_mask = params->sta_flags_mask;
                strStaParams.u16FlagsSet = params->sta_flags_set;
 
                PRINT_D(HOSTAPD_DBG, "IS HT supported = %d\n",
@@ -3160,7 +3161,8 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev,
                        strStaParams.ht_tx_bf_cap);
                PRINT_D(HOSTAPD_DBG, "Antenna selection info = %d\n",
                        strStaParams.ht_ante_sel);
-               PRINT_D(HOSTAPD_DBG, "Flag Mask = %d\n", strStaParams.u16FlagsMask);
+               PRINT_D(HOSTAPD_DBG, "Flag Mask = %d\n",
+                       strStaParams.flags_mask);
                PRINT_D(HOSTAPD_DBG, "Flag Set = %d\n", strStaParams.u16FlagsSet);
 
                s32Error = host_int_edit_station(priv->hWILCWFIDrv, &strStaParams);