if (!ieee->current_network.qos_data.active ||
            !ieee->ht_info->current_ht_support ||
-           !ieee->ht_info->bCurrentAMPDUEnable) {
+           !ieee->ht_info->current_ampdu_enable) {
                netdev_warn(ieee->dev,
                            "reject to ADDBA_RSP as some capability is not ready(%d, %d, %d)\n",
                            ieee->current_network.qos_data.active,
                            ieee->ht_info->current_ht_support,
-                           ieee->ht_info->bCurrentAMPDUEnable);
+                           ieee->ht_info->current_ampdu_enable);
                reason_code = DELBA_REASON_UNKNOWN_BA;
                goto OnADDBARsp_Reject;
        }
 
        u8 bCurrent_AMSDU_Support;
        u16 nCurrent_AMSDU_MaxSize;
        u8 bAMPDUEnable;
-       u8 bCurrentAMPDUEnable;
+       u8 current_ampdu_enable;
        u8 AMPDU_Factor;
        u8 CurrentAMPDUFactor;
        u8 MPDU_Density;
 
        else
                ht_info->nCurrent_AMSDU_MaxSize = ht_info->nAMSDU_MaxSize;
 
-       ht_info->bCurrentAMPDUEnable = ht_info->bAMPDUEnable;
+       ht_info->current_ampdu_enable = ht_info->bAMPDUEnable;
        if (ieee->rtllib_ap_sec_type &&
            (ieee->rtllib_ap_sec_type(ieee) & (SEC_ALG_WEP | SEC_ALG_TKIP))) {
                if ((ht_info->IOTPeer == HT_IOT_PEER_ATHEROS) ||
                    (ht_info->IOTPeer == HT_IOT_PEER_UNKNOWN))
-                       ht_info->bCurrentAMPDUEnable = false;
+                       ht_info->current_ampdu_enable = false;
        }
 
        if (!ht_info->reg_rt2rt_aggregation) {
        ht_info->current_mpdu_density = max_t(u8, ht_info->MPDU_Density,
                                              pPeerHTCap->MPDUDensity);
        if (ht_info->iot_action & HT_IOT_ACT_TX_USE_AMSDU_8K) {
-               ht_info->bCurrentAMPDUEnable = false;
+               ht_info->current_ampdu_enable = false;
                ht_info->ForcedAMSDUMode = HT_AGG_FORCE_ENABLE;
        }
        ht_info->cur_rx_reorder_enable = ht_info->reg_rx_reorder_enable;
 
 
        if (!ieee->GetNmodeSupportBySecCfg(ieee->dev))
                return;
-       if (ht_info->bCurrentAMPDUEnable) {
+       if (ht_info->current_ampdu_enable) {
                if (!rtllib_get_ts(ieee, (struct ts_common_info **)(&pTxTs), hdr->addr1,
                           skb->priority, TX_DIR, true)) {
                        netdev_info(ieee->dev, "%s: can't get TS\n", __func__);