From: Leo Kim <leo.kim@xxxxxxxxx>
This patch renames u16FlagsMask of struct add_sta_param to flags_mask
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim <leo.kim@xxxxxxxxx>
Signed-off-by: Glen Lee <glen.lee@xxxxxxxxx>
---
drivers/staging/wilc1000/host_interface.c | 4 ++--
drivers/staging/wilc1000/host_interface.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 10 ++++++----
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index ebf0be4..01d84c0 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2340,8 +2340,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 47eb5a0..ca8eb10 100644
--- 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 b6d2246..1cb779d 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3033,7 +3033,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",
@@ -3048,7 +3048,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);
@@ -3155,7 +3156,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",
@@ -3170,7 +3171,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);
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
