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: 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 2cf3ed5bd1cc6a4e4c8065f552e4bec2674d1b75..512000e986a8ee4cd0e0e2f5346d03c47aa2091a 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -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)

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 58e4f920504af3aec55536935a47ec20aa06124a..7d8a166307631623751d37e54d571bf4ed232f2e 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -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;

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 2ec85f037a7adae02f680c15571236954c5dbca9..00fa41133f03497eae8cb634efc5a01cdce3284f 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -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) {