staging: wilc1000: rename u32TxBeamformingCap of struct add_sta_param

This patch renames u32TxBeamformingCap of struct add_sta_param to ht_tx_bf_cap
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 be1fcbd37eec776037f513894f7947282b44b6d0..41ccd80b3d84a2d3e3a1385c8fbb5aeefe34a18b 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2332,10 +2332,10 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer,
        *pu8CurrByte++ = pstrStationParam->ht_ext_params & 0xFF;
        *pu8CurrByte++ = (pstrStationParam->ht_ext_params >> 8) & 0xFF;
 
-       *pu8CurrByte++ = pstrStationParam->u32TxBeamformingCap & 0xFF;
-       *pu8CurrByte++ = (pstrStationParam->u32TxBeamformingCap >> 8) & 0xFF;
-       *pu8CurrByte++ = (pstrStationParam->u32TxBeamformingCap >> 16) & 0xFF;
-       *pu8CurrByte++ = (pstrStationParam->u32TxBeamformingCap >> 24) & 0xFF;
+       *pu8CurrByte++ = pstrStationParam->ht_tx_bf_cap & 0xFF;
+       *pu8CurrByte++ = (pstrStationParam->ht_tx_bf_cap >> 8) & 0xFF;
+       *pu8CurrByte++ = (pstrStationParam->ht_tx_bf_cap >> 16) & 0xFF;
+       *pu8CurrByte++ = (pstrStationParam->ht_tx_bf_cap >> 24) & 0xFF;
 
        *pu8CurrByte++ = pstrStationParam->u8ASELCap;
 

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index c8e2d3fea6f80f94a3005a84c197dd746f3986f1..3311d2faf59df1b340a9f1e535fb6200f0c7b841 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -297,7 +297,7 @@ struct add_sta_param {
        u8 ht_ampdu_params;
        u8 ht_supp_mcs_set[16];
        u16 ht_ext_params;
-       u32 u32TxBeamformingCap;
+       u32 ht_tx_bf_cap;
        u8 u8ASELCap;
        u16 u16FlagsMask;
        u16 u16FlagsSet;

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index e41778587e64b1e9b152ea90e96a9286f56587de..abd90963e5ad3eb39c30f6a3ebc59e1baa25aed9 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3019,7 +3019,7 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev,
                               &params->ht_capa->mcs,
                               WILC_SUPP_MCS_SET_SIZE);
                        strStaParams.ht_ext_params = params->ht_capa->extended_ht_cap_info;
-                       strStaParams.u32TxBeamformingCap = params->ht_capa->tx_BF_cap_info;
+                       strStaParams.ht_tx_bf_cap = params->ht_capa->tx_BF_cap_info;
                        strStaParams.u8ASELCap = params->ht_capa->antenna_selection_info;
                }
 
@@ -3034,7 +3034,8 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev,
                        strStaParams.ht_ampdu_params);
                PRINT_D(HOSTAPD_DBG, "HT Extended params = %d\n",
                        strStaParams.ht_ext_params);
-               PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n", strStaParams.u32TxBeamformingCap);
+               PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n",
+                       strStaParams.ht_tx_bf_cap);
                PRINT_D(HOSTAPD_DBG, "Antenna selection info = %d\n", strStaParams.u8ASELCap);
                PRINT_D(HOSTAPD_DBG, "Flag Mask = %d\n", strStaParams.u16FlagsMask);
                PRINT_D(HOSTAPD_DBG, "Flag Set = %d\n", strStaParams.u16FlagsSet);
@@ -3139,7 +3140,7 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev,
                               &params->ht_capa->mcs,
                               WILC_SUPP_MCS_SET_SIZE);
                        strStaParams.ht_ext_params = params->ht_capa->extended_ht_cap_info;
-                       strStaParams.u32TxBeamformingCap = params->ht_capa->tx_BF_cap_info;
+                       strStaParams.ht_tx_bf_cap = params->ht_capa->tx_BF_cap_info;
                        strStaParams.u8ASELCap = params->ht_capa->antenna_selection_info;
 
                }
@@ -3155,7 +3156,8 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev,
                        strStaParams.ht_ampdu_params);
                PRINT_D(HOSTAPD_DBG, "HT Extended params = %d\n",
                        strStaParams.ht_ext_params);
-               PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n", strStaParams.u32TxBeamformingCap);
+               PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n",
+                       strStaParams.ht_tx_bf_cap);
                PRINT_D(HOSTAPD_DBG, "Antenna selection info = %d\n", strStaParams.u8ASELCap);
                PRINT_D(HOSTAPD_DBG, "Flag Mask = %d\n", strStaParams.u16FlagsMask);
                PRINT_D(HOSTAPD_DBG, "Flag Set = %d\n", strStaParams.u16FlagsSet);