]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: wilc1000: rename u8ASELCap of struct add_sta_param
authorLeo Kim <leo.kim@atmel.com>
Thu, 29 Oct 2015 03:05:51 +0000 (12:05 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Nov 2015 04:02:47 +0000 (20:02 -0800)
This patch renames u8ASELCap of struct add_sta_param to ht_ante_sel
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>
drivers/staging/wilc1000/host_interface.c
drivers/staging/wilc1000/host_interface.h
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

index 41ccd80b3d84a2d3e3a1385c8fbb5aeefe34a18b..5a2e874d4d71e022131f1e44d50f6e5e0ba9eca9 100644 (file)
@@ -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 >> 24) & 0xFF;
 
-       *pu8CurrByte++ = pstrStationParam->u8ASELCap;
+       *pu8CurrByte++ = pstrStationParam->ht_ante_sel;
 
        *pu8CurrByte++ = pstrStationParam->u16FlagsMask & 0xFF;
        *pu8CurrByte++ = (pstrStationParam->u16FlagsMask >> 8) & 0xFF;
index 3311d2faf59df1b340a9f1e535fb6200f0c7b841..5ad0bfa84f00cb16a025bcfdb85940a33f7c4d79 100644 (file)
@@ -298,7 +298,7 @@ struct add_sta_param {
        u8 ht_supp_mcs_set[16];
        u16 ht_ext_params;
        u32 ht_tx_bf_cap;
-       u8 u8ASELCap;
+       u8 ht_ante_sel;
        u16 u16FlagsMask;
        u16 u16FlagsSet;
 };
index abd90963e5ad3eb39c30f6a3ebc59e1baa25aed9..a2c08783f4051a74392908f70effafc2b247cc02 100644 (file)
@@ -3020,7 +3020,7 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev,
                               WILC_SUPP_MCS_SET_SIZE);
                        strStaParams.ht_ext_params = params->ht_capa->extended_ht_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;
@@ -3036,7 +3036,8 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev,
                        strStaParams.ht_ext_params);
                PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n",
                        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 Set = %d\n", strStaParams.u16FlagsSet);
 
@@ -3141,8 +3142,7 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev,
                               WILC_SUPP_MCS_SET_SIZE);
                        strStaParams.ht_ext_params = params->ht_capa->extended_ht_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;
@@ -3158,7 +3158,8 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev,
                        strStaParams.ht_ext_params);
                PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n",
                        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 Set = %d\n", strStaParams.u16FlagsSet);