OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: wilc1000: rename u16HTExtParams of struct add_sta_param 

This patch renames u16HTExtParams of struct add_sta_param to ht_ext_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>
This commit is contained in:
Leo Kim 2015-10-29 12:05:49 +09:00 committed by Greg Kroah-Hartman
parent 5ebbf4f748
commit 223741d71e
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/wilc1000/host_interface.c
View File

@ -2329,8 +2329,8 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer,
WILC_SUPP_MCS_SET_SIZE);
pu8CurrByte += WILC_SUPP_MCS_SET_SIZE;
*pu8CurrByte++ = pstrStationParam->u16HTExtParams & 0xFF;
*pu8CurrByte++ = (pstrStationParam->u16HTExtParams >> 8) & 0xFF;
*pu8CurrByte++ = pstrStationParam->ht_ext_params & 0xFF;
*pu8CurrByte++ = (pstrStationParam->ht_ext_params >> 8) & 0xFF;
*pu8CurrByte++ = pstrStationParam->u32TxBeamformingCap & 0xFF;
*pu8CurrByte++ = (pstrStationParam->u32TxBeamformingCap >> 8) & 0xFF;

2
drivers/staging/wilc1000/host_interface.h
View File

@ -296,7 +296,7 @@ struct add_sta_param {
u16 ht_capa_info;
u8 ht_ampdu_params;
u8 ht_supp_mcs_set[16];
u16 u16HTExtParams;
u16 ht_ext_params;
u32 u32TxBeamformingCap;
u8 u8ASELCap;
u16 u16FlagsMask;

10
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
View File

@ -3018,7 +3018,7 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev,
memcpy(strStaParams.ht_supp_mcs_set,
&params->ht_capa->mcs,
WILC_SUPP_MCS_SET_SIZE);
strStaParams.u16HTExtParams = params->ht_capa->extended_ht_cap_info;
strStaParams.ht_ext_params = params->ht_capa->extended_ht_cap_info;
strStaParams.u32TxBeamformingCap = params->ht_capa->tx_BF_cap_info;
strStaParams.u8ASELCap = params->ht_capa->antenna_selection_info;
}
@ -3032,7 +3032,8 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev,
strStaParams.ht_capa_info);
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, "HT Extended params = %d\n",
strStaParams.ht_ext_params);
PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n", strStaParams.u32TxBeamformingCap);
PRINT_D(HOSTAPD_DBG, "Antenna selection info = %d\n", strStaParams.u8ASELCap);
PRINT_D(HOSTAPD_DBG, "Flag Mask = %d\n", strStaParams.u16FlagsMask);
@ -3137,7 +3138,7 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev,
memcpy(strStaParams.ht_supp_mcs_set,
&params->ht_capa->mcs,
WILC_SUPP_MCS_SET_SIZE);
strStaParams.u16HTExtParams = params->ht_capa->extended_ht_cap_info;
strStaParams.ht_ext_params = params->ht_capa->extended_ht_cap_info;
strStaParams.u32TxBeamformingCap = params->ht_capa->tx_BF_cap_info;
strStaParams.u8ASELCap = params->ht_capa->antenna_selection_info;
@ -3152,7 +3153,8 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev,
strStaParams.ht_capa_info);
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, "HT Extended params = %d\n",
strStaParams.ht_ext_params);
PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n", strStaParams.u32TxBeamformingCap);
PRINT_D(HOSTAPD_DBG, "Antenna selection info = %d\n", strStaParams.u8ASELCap);
PRINT_D(HOSTAPD_DBG, "Flag Mask = %d\n", strStaParams.u16FlagsMask);