diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-11-25 11:46:15 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-11-28 15:05:01 -0500 |
commit | 8c0c709eea5cbab97fb464cd68b06f24acc58ee1 (patch) | |
tree | 23af087965cd5f6142e951eccbee1817560e6506 /include/net/mac80211.h | |
parent | e60d7443e00a72a2c056950cdaab79c7b077f3d4 (diff) |
mac80211: move cmntr flag out of rx flags
The RX flags should soon be used only for flags
that cannot change within an a-MPDU, so move the
cooked monitor flag into the RX status flags.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r-- | include/net/mac80211.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 3754ea405c88..1d75b960da06 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -513,6 +513,9 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info) | |||
513 | * @RX_FLAG_HT: HT MCS was used and rate_idx is MCS index | 513 | * @RX_FLAG_HT: HT MCS was used and rate_idx is MCS index |
514 | * @RX_FLAG_40MHZ: HT40 (40 MHz) was used | 514 | * @RX_FLAG_40MHZ: HT40 (40 MHz) was used |
515 | * @RX_FLAG_SHORT_GI: Short guard interval was used | 515 | * @RX_FLAG_SHORT_GI: Short guard interval was used |
516 | * @RX_FLAG_INTERNAL_CMTR: set internally after frame was reported | ||
517 | * on cooked monitor to avoid double-reporting it for multiple | ||
518 | * virtual interfaces | ||
516 | */ | 519 | */ |
517 | enum mac80211_rx_flags { | 520 | enum mac80211_rx_flags { |
518 | RX_FLAG_MMIC_ERROR = 1<<0, | 521 | RX_FLAG_MMIC_ERROR = 1<<0, |
@@ -526,6 +529,7 @@ enum mac80211_rx_flags { | |||
526 | RX_FLAG_HT = 1<<9, | 529 | RX_FLAG_HT = 1<<9, |
527 | RX_FLAG_40MHZ = 1<<10, | 530 | RX_FLAG_40MHZ = 1<<10, |
528 | RX_FLAG_SHORT_GI = 1<<11, | 531 | RX_FLAG_SHORT_GI = 1<<11, |
532 | RX_FLAG_INTERNAL_CMTR = 1<<12, | ||
529 | }; | 533 | }; |
530 | 534 | ||
531 | /** | 535 | /** |