Commit a486baff authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman

staging: wilc1000: rename u8ASELCap of struct add_sta_param

This patch renames u8ASELCap of struct add_sta_param to ht_ante_sel
to avoid CamelCase naming convention.
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 74fe73cf
...@@ -2337,7 +2337,7 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer, ...@@ -2337,7 +2337,7 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer,
*pu8CurrByte++ = (pstrStationParam->ht_tx_bf_cap >> 16) & 0xFF; *pu8CurrByte++ = (pstrStationParam->ht_tx_bf_cap >> 16) & 0xFF;
*pu8CurrByte++ = (pstrStationParam->ht_tx_bf_cap >> 24) & 0xFF; *pu8CurrByte++ = (pstrStationParam->ht_tx_bf_cap >> 24) & 0xFF;
*pu8CurrByte++ = pstrStationParam->u8ASELCap; *pu8CurrByte++ = pstrStationParam->ht_ante_sel;
*pu8CurrByte++ = pstrStationParam->u16FlagsMask & 0xFF; *pu8CurrByte++ = pstrStationParam->u16FlagsMask & 0xFF;
*pu8CurrByte++ = (pstrStationParam->u16FlagsMask >> 8) & 0xFF; *pu8CurrByte++ = (pstrStationParam->u16FlagsMask >> 8) & 0xFF;
......
...@@ -298,7 +298,7 @@ struct add_sta_param { ...@@ -298,7 +298,7 @@ struct add_sta_param {
u8 ht_supp_mcs_set[16]; u8 ht_supp_mcs_set[16];
u16 ht_ext_params; u16 ht_ext_params;
u32 ht_tx_bf_cap; u32 ht_tx_bf_cap;
u8 u8ASELCap; u8 ht_ante_sel;
u16 u16FlagsMask; u16 u16FlagsMask;
u16 u16FlagsSet; u16 u16FlagsSet;
}; };
......
...@@ -3020,7 +3020,7 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev, ...@@ -3020,7 +3020,7 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev,
WILC_SUPP_MCS_SET_SIZE); WILC_SUPP_MCS_SET_SIZE);
strStaParams.ht_ext_params = params->ht_capa->extended_ht_cap_info; strStaParams.ht_ext_params = params->ht_capa->extended_ht_cap_info;
strStaParams.ht_tx_bf_cap = 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; strStaParams.ht_ante_sel = params->ht_capa->antenna_selection_info;
} }
strStaParams.u16FlagsMask = params->sta_flags_mask; strStaParams.u16FlagsMask = params->sta_flags_mask;
...@@ -3036,7 +3036,8 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev, ...@@ -3036,7 +3036,8 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev,
strStaParams.ht_ext_params); strStaParams.ht_ext_params);
PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n", PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n",
strStaParams.ht_tx_bf_cap); strStaParams.ht_tx_bf_cap);
PRINT_D(HOSTAPD_DBG, "Antenna selection info = %d\n", strStaParams.u8ASELCap); 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.u16FlagsMask);
PRINT_D(HOSTAPD_DBG, "Flag Set = %d\n", strStaParams.u16FlagsSet); PRINT_D(HOSTAPD_DBG, "Flag Set = %d\n", strStaParams.u16FlagsSet);
...@@ -3141,8 +3142,7 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev, ...@@ -3141,8 +3142,7 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev,
WILC_SUPP_MCS_SET_SIZE); WILC_SUPP_MCS_SET_SIZE);
strStaParams.ht_ext_params = params->ht_capa->extended_ht_cap_info; strStaParams.ht_ext_params = params->ht_capa->extended_ht_cap_info;
strStaParams.ht_tx_bf_cap = 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; strStaParams.ht_ante_sel = params->ht_capa->antenna_selection_info;
} }
strStaParams.u16FlagsMask = params->sta_flags_mask; strStaParams.u16FlagsMask = params->sta_flags_mask;
...@@ -3158,7 +3158,8 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev, ...@@ -3158,7 +3158,8 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev,
strStaParams.ht_ext_params); strStaParams.ht_ext_params);
PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n", PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n",
strStaParams.ht_tx_bf_cap); strStaParams.ht_tx_bf_cap);
PRINT_D(HOSTAPD_DBG, "Antenna selection info = %d\n", strStaParams.u8ASELCap); 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.u16FlagsMask);
PRINT_D(HOSTAPD_DBG, "Flag Set = %d\n", strStaParams.u16FlagsSet); PRINT_D(HOSTAPD_DBG, "Flag Set = %d\n", strStaParams.u16FlagsSet);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment