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

staging: wilc1000: rename u16AssocID of struct add_sta_param

This patch renames u16AssocID of struct add_sta_param to aid
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 2353c388
......@@ -2311,8 +2311,8 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer,
memcpy(pu8CurrByte, pstrStationParam->bssid, ETH_ALEN);
pu8CurrByte += ETH_ALEN;
*pu8CurrByte++ = pstrStationParam->u16AssocID & 0xFF;
*pu8CurrByte++ = (pstrStationParam->u16AssocID >> 8) & 0xFF;
*pu8CurrByte++ = pstrStationParam->aid & 0xFF;
*pu8CurrByte++ = (pstrStationParam->aid >> 8) & 0xFF;
*pu8CurrByte++ = pstrStationParam->u8NumRates;
if (pstrStationParam->u8NumRates > 0)
......
......@@ -289,7 +289,7 @@ struct host_if_drv {
struct add_sta_param {
u8 bssid[ETH_ALEN];
u16 u16AssocID;
u16 aid;
u8 u8NumRates;
const u8 *pu8Rates;
bool bIsHTSupported;
......
......@@ -2997,7 +2997,7 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev,
if (nic->iftype == AP_MODE || nic->iftype == GO_MODE) {
memcpy(strStaParams.bssid, mac, ETH_ALEN);
memcpy(priv->assoc_stainfo.au8Sta_AssociatedBss[params->aid], mac, ETH_ALEN);
strStaParams.u16AssocID = params->aid;
strStaParams.aid = params->aid;
strStaParams.u8NumRates = params->supported_rates_len;
strStaParams.pu8Rates = params->supported_rates;
......@@ -3005,7 +3005,7 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev,
PRINT_D(CFG80211_DBG, "BSSID = %x%x%x%x%x%x\n", priv->assoc_stainfo.au8Sta_AssociatedBss[params->aid][0], priv->assoc_stainfo.au8Sta_AssociatedBss[params->aid][1], priv->assoc_stainfo.au8Sta_AssociatedBss[params->aid][2], priv->assoc_stainfo.au8Sta_AssociatedBss[params->aid][3], priv->assoc_stainfo.au8Sta_AssociatedBss[params->aid][4],
priv->assoc_stainfo.au8Sta_AssociatedBss[params->aid][5]);
PRINT_D(HOSTAPD_DBG, "ASSOC ID = %d\n", strStaParams.u16AssocID);
PRINT_D(HOSTAPD_DBG, "ASSOC ID = %d\n", strStaParams.aid);
PRINT_D(HOSTAPD_DBG, "Number of supported rates = %d\n", strStaParams.u8NumRates);
if (params->ht_capa == NULL) {
......@@ -3110,7 +3110,7 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev,
if (nic->iftype == AP_MODE || nic->iftype == GO_MODE) {
memcpy(strStaParams.bssid, mac, ETH_ALEN);
strStaParams.u16AssocID = params->aid;
strStaParams.aid = params->aid;
strStaParams.u8NumRates = params->supported_rates_len;
strStaParams.pu8Rates = params->supported_rates;
......@@ -3118,7 +3118,7 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev,
strStaParams.bssid[0], strStaParams.bssid[1],
strStaParams.bssid[2], strStaParams.bssid[3],
strStaParams.bssid[4], strStaParams.bssid[5]);
PRINT_D(HOSTAPD_DBG, "ASSOC ID = %d\n", strStaParams.u16AssocID);
PRINT_D(HOSTAPD_DBG, "ASSOC ID = %d\n", strStaParams.aid);
PRINT_D(HOSTAPD_DBG, "Number of supported rates = %d\n", strStaParams.u8NumRates);
if (params->ht_capa == NULL) {
......
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