aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/net/cfg80211.h1
-rw-r--r--include/uapi/linux/nl80211.h8
2 files changed, 9 insertions, 0 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index d10ba3a1bfa8..d5e57bf678a6 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1776,6 +1776,7 @@ struct cfg80211_bitrate_mask {
1776 u32 legacy; 1776 u32 legacy;
1777 u8 ht_mcs[IEEE80211_HT_MCS_MASK_LEN]; 1777 u8 ht_mcs[IEEE80211_HT_MCS_MASK_LEN];
1778 u16 vht_mcs[NL80211_VHT_NSS_MAX]; 1778 u16 vht_mcs[NL80211_VHT_NSS_MAX];
1779 enum nl80211_txrate_gi gi;
1779 } control[IEEE80211_NUM_BANDS]; 1780 } control[IEEE80211_NUM_BANDS];
1780}; 1781};
1781/** 1782/**
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 9a86c8bf6da6..53e56cf7c0fe 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -3156,6 +3156,7 @@ enum nl80211_key_attributes {
3156 * in an array of MCS numbers. 3156 * in an array of MCS numbers.
3157 * @NL80211_TXRATE_VHT: VHT rates allowed for TX rate selection, 3157 * @NL80211_TXRATE_VHT: VHT rates allowed for TX rate selection,
3158 * see &struct nl80211_txrate_vht 3158 * see &struct nl80211_txrate_vht
3159 * @NL80211_TXRATE_GI: configure GI, see &enum nl80211_txrate_gi
3159 * @__NL80211_TXRATE_AFTER_LAST: internal 3160 * @__NL80211_TXRATE_AFTER_LAST: internal
3160 * @NL80211_TXRATE_MAX: highest TX rate attribute 3161 * @NL80211_TXRATE_MAX: highest TX rate attribute
3161 */ 3162 */
@@ -3164,6 +3165,7 @@ enum nl80211_tx_rate_attributes {
3164 NL80211_TXRATE_LEGACY, 3165 NL80211_TXRATE_LEGACY,
3165 NL80211_TXRATE_HT, 3166 NL80211_TXRATE_HT,
3166 NL80211_TXRATE_VHT, 3167 NL80211_TXRATE_VHT,
3168 NL80211_TXRATE_GI,
3167 3169
3168 /* keep last */ 3170 /* keep last */
3169 __NL80211_TXRATE_AFTER_LAST, 3171 __NL80211_TXRATE_AFTER_LAST,
@@ -3181,6 +3183,12 @@ struct nl80211_txrate_vht {
3181 __u16 mcs[NL80211_VHT_NSS_MAX]; 3183 __u16 mcs[NL80211_VHT_NSS_MAX];
3182}; 3184};
3183 3185
3186enum nl80211_txrate_gi {
3187 NL80211_TXRATE_DEFAULT_GI,
3188 NL80211_TXRATE_FORCE_SGI,
3189 NL80211_TXRATE_FORCE_LGI,
3190};
3191
3184/** 3192/**
3185 * enum nl80211_band - Frequency band 3193 * enum nl80211_band - Frequency band
3186 * @NL80211_BAND_2GHZ: 2.4 GHz ISM band 3194 * @NL80211_BAND_2GHZ: 2.4 GHz ISM band