staging: wilc1000: rename u8AmpduParams of struct add_sta_param

This patch renames u8AmpduParams of struct add_sta_param to ht_ampdu_params
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 e6388ffae6d2c941e41161589402e391af772c55..8f7d3027ba1c2937f5108e0bdd5e317468214db4 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2324,7 +2324,7 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer,
        *pu8CurrByte++ = pstrStationParam->ht_capa_info & 0xFF;
        *pu8CurrByte++ = (pstrStationParam->ht_capa_info >> 8) & 0xFF;
 
-       *pu8CurrByte++ = pstrStationParam->u8AmpduParams;
+       *pu8CurrByte++ = pstrStationParam->ht_ampdu_params;
        memcpy(pu8CurrByte, pstrStationParam->au8SuppMCsSet, WILC_SUPP_MCS_SET_SIZE);
        pu8CurrByte += WILC_SUPP_MCS_SET_SIZE;
 

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 782088fadc0e92dae1455bcab8cb1526a63f2f6b..bb3bf077e9ced113f8b2e59dc794f4850ca19523 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -294,7 +294,7 @@ struct add_sta_param {
        const u8 *rates;
        bool ht_supported;
        u16 ht_capa_info;
-       u8 u8AmpduParams;
+       u8 ht_ampdu_params;
        u8 au8SuppMCsSet[16];
        u16 u16HTExtParams;
        u32 u32TxBeamformingCap;

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 0d465c1119bc8d348020822269425b2dbc31f610..5ea7bd2ededba79dc42df0409448c8150855b8df 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3014,7 +3014,7 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev,
                } else {
                        strStaParams.ht_supported = true;
                        strStaParams.ht_capa_info = params->ht_capa->cap_info;
-                       strStaParams.u8AmpduParams = params->ht_capa->ampdu_params_info;
+                       strStaParams.ht_ampdu_params = params->ht_capa->ampdu_params_info;
                        memcpy(strStaParams.au8SuppMCsSet, &params->ht_capa->mcs, WILC_SUPP_MCS_SET_SIZE);
                        strStaParams.u16HTExtParams = params->ht_capa->extended_ht_cap_info;
                        strStaParams.u32TxBeamformingCap = params->ht_capa->tx_BF_cap_info;
@@ -3028,7 +3028,8 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev,
                        strStaParams.ht_supported);
                PRINT_D(HOSTAPD_DBG, "Capability Info = %d\n",
                        strStaParams.ht_capa_info);
-               PRINT_D(HOSTAPD_DBG, "AMPDU Params = %d\n", strStaParams.u8AmpduParams);
+               PRINT_D(HOSTAPD_DBG, "AMPDU Params = %d\n",
+                       strStaParams.ht_ampdu_params);
                PRINT_D(HOSTAPD_DBG, "HT Extended params = %d\n", strStaParams.u16HTExtParams);
                PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n", strStaParams.u32TxBeamformingCap);
                PRINT_D(HOSTAPD_DBG, "Antenna selection info = %d\n", strStaParams.u8ASELCap);
@@ -3130,7 +3131,7 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev,
                } else {
                        strStaParams.ht_supported = true;
                        strStaParams.ht_capa_info = params->ht_capa->cap_info;
-                       strStaParams.u8AmpduParams = params->ht_capa->ampdu_params_info;
+                       strStaParams.ht_ampdu_params = params->ht_capa->ampdu_params_info;
                        memcpy(strStaParams.au8SuppMCsSet, &params->ht_capa->mcs, WILC_SUPP_MCS_SET_SIZE);
                        strStaParams.u16HTExtParams = params->ht_capa->extended_ht_cap_info;
                        strStaParams.u32TxBeamformingCap = params->ht_capa->tx_BF_cap_info;
@@ -3145,7 +3146,8 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev,
                        strStaParams.ht_supported);
                PRINT_D(HOSTAPD_DBG, "Capability Info = %d\n",
                        strStaParams.ht_capa_info);
-               PRINT_D(HOSTAPD_DBG, "AMPDU Params = %d\n", strStaParams.u8AmpduParams);
+               PRINT_D(HOSTAPD_DBG, "AMPDU Params = %d\n",
+                       strStaParams.ht_ampdu_params);
                PRINT_D(HOSTAPD_DBG, "HT Extended params = %d\n", strStaParams.u16HTExtParams);
                PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n", strStaParams.u32TxBeamformingCap);
                PRINT_D(HOSTAPD_DBG, "Antenna selection info = %d\n", strStaParams.u8ASELCap);