he_cap_elem->phy_cap_info[2] = IEEE80211_HE_PHY_CAP2_STBC_TX_UNDER_80MHZ |
                                       IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ;
 
+       he_cap_elem->phy_cap_info[7] =
+                       IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI;
+
        switch (iftype) {
        case NL80211_IFTYPE_AP:
                he_cap_elem->mac_cap_info[0] |= IEEE80211_HE_MAC_CAP0_TWT_RES;
                        IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE |
                        IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT;
                he_cap_elem->phy_cap_info[7] |=
-                       IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP |
-                       IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI;
+                       IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP;
                he_cap_elem->phy_cap_info[8] |=
                        IEEE80211_HE_PHY_CAP8_20MHZ_IN_40MHZ_HE_PPDU_IN_2G |
                        IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU |