if (ieee->pHTInfo->bCurrentHTSupport)
                HT_update_self_and_peer_setting(ieee, net);
        ieee->pHTInfo->bCurrentRT2RTLongSlotTime = net->bssht.bd_rt2rt_long_slot_time;
-       ieee->pHTInfo->RT2RT_HT_Mode = net->bssht.RT2RT_HT_Mode;
+       ieee->pHTInfo->RT2RT_HT_Mode = net->bssht.rt2rt_ht_mode;
        _rtl92e_update_cap(dev, net->capability);
 }
 
 
 
        if (net->bssht.bd_rt2rt_aggregation) {
                pHTInfo->IOTPeer = HT_IOT_PEER_REALTEK;
-               if (net->bssht.RT2RT_HT_Mode & RT_HT_CAP_USE_92SE)
+               if (net->bssht.rt2rt_ht_mode & RT_HT_CAP_USE_92SE)
                        pHTInfo->IOTPeer = HT_IOT_PEER_REALTEK_92SE;
-               if (net->bssht.RT2RT_HT_Mode & RT_HT_CAP_USE_SOFTAP)
+               if (net->bssht.rt2rt_ht_mode & RT_HT_CAP_USE_SOFTAP)
                        pHTInfo->IOTPeer = HT_IOT_PEER_92U_SOFTAP;
        } else if (net->broadcom_cap_exist) {
                pHTInfo->IOTPeer = HT_IOT_PEER_BROADCOM;
 
        pBssHT->bd_rt2rt_aggregation = false;
        pBssHT->bd_rt2rt_long_slot_time = false;
-       pBssHT->RT2RT_HT_Mode = (enum rt_ht_capability)0;
+       pBssHT->rt2rt_ht_mode = (enum rt_ht_capability)0;
 }
 
 void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee,
                                 pNetwork->bssht.bd_rt2rt_aggregation;
                        pHTInfo->bCurrentRT2RTLongSlotTime =
                                 pNetwork->bssht.bd_rt2rt_long_slot_time;
-                       pHTInfo->RT2RT_HT_Mode = pNetwork->bssht.RT2RT_HT_Mode;
+                       pHTInfo->RT2RT_HT_Mode = pNetwork->bssht.rt2rt_ht_mode;
                } else {
                        pHTInfo->bCurrentRT2RTAggregation = false;
                        pHTInfo->bCurrentRT2RTLongSlotTime = false;
 
 
                        if ((ht_realtek_agg_buf[4] == 1) &&
                            (ht_realtek_agg_buf[5] & RT_HT_CAP_USE_92SE))
-                               network->bssht.RT2RT_HT_Mode |= RT_HT_CAP_USE_92SE;
+                               network->bssht.rt2rt_ht_mode |= RT_HT_CAP_USE_92SE;
                }
        }
        if (ht_realtek_agg_len >= 5) {
                if ((ht_realtek_agg_buf[5] & RT_HT_CAP_USE_SOFTAP))
-                       network->bssht.RT2RT_HT_Mode |= RT_HT_CAP_USE_SOFTAP;
+                       network->bssht.rt2rt_ht_mode |= RT_HT_CAP_USE_SOFTAP;
        }
 
        if ((info_element->len >= 3 &&