diff options
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r-- | include/net/mac80211.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 39c516c352be..7e5af6d90b93 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -255,9 +255,6 @@ struct ieee80211_bss_conf { | |||
255 | * @IEEE80211_TX_CTL_RATE_CTRL_PROBE: internal to mac80211, can be | 255 | * @IEEE80211_TX_CTL_RATE_CTRL_PROBE: internal to mac80211, can be |
256 | * set by rate control algorithms to indicate probe rate, will | 256 | * set by rate control algorithms to indicate probe rate, will |
257 | * be cleared for fragmented frames (except on the last fragment) | 257 | * be cleared for fragmented frames (except on the last fragment) |
258 | * @IEEE80211_TX_INTFL_RCALGO: mac80211 internal flag, do not test or | ||
259 | * set this flag in the driver; indicates that the rate control | ||
260 | * algorithm was used and should be notified of TX status | ||
261 | * @IEEE80211_TX_INTFL_NEED_TXPROCESSING: completely internal to mac80211, | 258 | * @IEEE80211_TX_INTFL_NEED_TXPROCESSING: completely internal to mac80211, |
262 | * used to indicate that a pending frame requires TX processing before | 259 | * used to indicate that a pending frame requires TX processing before |
263 | * it can be sent out. | 260 | * it can be sent out. |
@@ -287,7 +284,6 @@ enum mac80211_tx_control_flags { | |||
287 | IEEE80211_TX_STAT_AMPDU = BIT(10), | 284 | IEEE80211_TX_STAT_AMPDU = BIT(10), |
288 | IEEE80211_TX_STAT_AMPDU_NO_BACK = BIT(11), | 285 | IEEE80211_TX_STAT_AMPDU_NO_BACK = BIT(11), |
289 | IEEE80211_TX_CTL_RATE_CTRL_PROBE = BIT(12), | 286 | IEEE80211_TX_CTL_RATE_CTRL_PROBE = BIT(12), |
290 | IEEE80211_TX_INTFL_RCALGO = BIT(13), | ||
291 | IEEE80211_TX_INTFL_NEED_TXPROCESSING = BIT(14), | 287 | IEEE80211_TX_INTFL_NEED_TXPROCESSING = BIT(14), |
292 | IEEE80211_TX_INTFL_RETRIED = BIT(15), | 288 | IEEE80211_TX_INTFL_RETRIED = BIT(15), |
293 | IEEE80211_TX_INTFL_DONT_ENCRYPT = BIT(16), | 289 | IEEE80211_TX_INTFL_DONT_ENCRYPT = BIT(16), |
@@ -2297,6 +2293,9 @@ enum rate_control_changed { | |||
2297 | * @short_preamble: whether mac80211 will request short-preamble transmission | 2293 | * @short_preamble: whether mac80211 will request short-preamble transmission |
2298 | * if the selected rate supports it | 2294 | * if the selected rate supports it |
2299 | * @max_rate_idx: user-requested maximum rate (not MCS for now) | 2295 | * @max_rate_idx: user-requested maximum rate (not MCS for now) |
2296 | * (deprecated; this will be removed once drivers get updated to use | ||
2297 | * rate_idx_mask) | ||
2298 | * @rate_idx_mask: user-requested rate mask (not MCS for now) | ||
2300 | * @skb: the skb that will be transmitted, the control information in it needs | 2299 | * @skb: the skb that will be transmitted, the control information in it needs |
2301 | * to be filled in | 2300 | * to be filled in |
2302 | * @ap: whether this frame is sent out in AP mode | 2301 | * @ap: whether this frame is sent out in AP mode |
@@ -2309,6 +2308,7 @@ struct ieee80211_tx_rate_control { | |||
2309 | struct ieee80211_tx_rate reported_rate; | 2308 | struct ieee80211_tx_rate reported_rate; |
2310 | bool rts, short_preamble; | 2309 | bool rts, short_preamble; |
2311 | u8 max_rate_idx; | 2310 | u8 max_rate_idx; |
2311 | u32 rate_idx_mask; | ||
2312 | bool ap; | 2312 | bool ap; |
2313 | }; | 2313 | }; |
2314 | 2314 | ||