Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[karo-tx-linux.git] / include / net / mac80211.h

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 4d05a9443344a54499e666ae2732fc320052d02b..76ed24a201eb9075672e8d2f55fffe5ae147923d 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1141,7 +1141,6 @@ enum mac80211_rx_flags {
  * enum mac80211_rx_encoding_flags - MCS & bandwidth flags
  *
  * @RX_ENC_FLAG_SHORTPRE: Short preamble was used for this frame
- * @RX_ENC_FLAG_40MHZ: HT40 (40 MHz) was used
  * @RX_ENC_FLAG_SHORT_GI: Short guard interval was used
  * @RX_ENC_FLAG_HT_GF: This frame was received in a HT-greenfield transmission,
  *     if the driver fills this value it should add
@@ -1153,7 +1152,6 @@ enum mac80211_rx_flags {
  */
 enum mac80211_rx_encoding_flags {
        RX_ENC_FLAG_SHORTPRE            = BIT(0),
-       RX_ENC_FLAG_40MHZ               = BIT(1),
        RX_ENC_FLAG_SHORT_GI            = BIT(2),
        RX_ENC_FLAG_HT_GF               = BIT(3),
        RX_ENC_FLAG_STBC_MASK           = BIT(4) | BIT(5),