staging: wilc1000: rename u16HTCapInfo of struct add_sta_param

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

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

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index d5b5158b5f7ead36c9fe8c8cee924db678e38434..0d465c1119bc8d348020822269425b2dbc31f610 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3013,7 +3013,7 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev,
                        strStaParams.ht_supported = false;
                } else {
                        strStaParams.ht_supported = true;
-                       strStaParams.u16HTCapInfo = params->ht_capa->cap_info;
+                       strStaParams.ht_capa_info = params->ht_capa->cap_info;
                        strStaParams.u8AmpduParams = 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;
@@ -3026,7 +3026,8 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev,
 
                PRINT_D(HOSTAPD_DBG, "IS HT supported = %d\n",
                        strStaParams.ht_supported);
-               PRINT_D(HOSTAPD_DBG, "Capability Info = %d\n", strStaParams.u16HTCapInfo);
+               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, "HT Extended params = %d\n", strStaParams.u16HTExtParams);
                PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n", strStaParams.u32TxBeamformingCap);
@@ -3128,7 +3129,7 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev,
                        strStaParams.ht_supported = false;
                } else {
                        strStaParams.ht_supported = true;
-                       strStaParams.u16HTCapInfo = params->ht_capa->cap_info;
+                       strStaParams.ht_capa_info = params->ht_capa->cap_info;
                        strStaParams.u8AmpduParams = 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;
@@ -3142,7 +3143,8 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev,
 
                PRINT_D(HOSTAPD_DBG, "IS HT supported = %d\n",
                        strStaParams.ht_supported);
-               PRINT_D(HOSTAPD_DBG, "Capability Info = %d\n", strStaParams.u16HTCapInfo);
+               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, "HT Extended params = %d\n", strStaParams.u16HTExtParams);
                PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n", strStaParams.u32TxBeamformingCap);