diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-03-20 11:53:20 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-03-20 11:53:20 -0400 |
| commit | 7eb2450a51ea7606fa69ae4bb2113e0f228223cc (patch) | |
| tree | 6cd273487574edd2da40ce14b1981e14a5171caa /include/net/mac80211.h | |
| parent | 474a41e94dfc85167e1761bfbb8bf180f90633b2 (diff) | |
| parent | 73fb08e24ae840bc518facc2c605dd6bb3751fec (diff) | |
| download | linux-7eb2450a51ea7606fa69ae4bb2113e0f228223cc.tar.gz linux-7eb2450a51ea7606fa69ae4bb2113e0f228223cc.tar.bz2 linux-7eb2450a51ea7606fa69ae4bb2113e0f228223cc.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'include/net/mac80211.h')
| -rw-r--r-- | include/net/mac80211.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 86faa413b37d..2de7ff42ff3a 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -697,11 +697,11 @@ struct ieee80211_tx_info { } control; struct { struct ieee80211_tx_rate rates[IEEE80211_TX_MAX_RATES]; - int ack_signal; + s32 ack_signal; u8 ampdu_ack_len; u8 ampdu_len; u8 antenna; - /* 21 bytes free */ + void *status_driver_data[21 / sizeof(void *)]; } status; struct { struct ieee80211_tx_rate driver_rates[ @@ -877,11 +877,13 @@ enum mac80211_rx_flags { * @RX_VHT_FLAG_80MHZ: 80 MHz was used * @RX_VHT_FLAG_80P80MHZ: 80+80 MHz was used * @RX_VHT_FLAG_160MHZ: 160 MHz was used + * @RX_VHT_FLAG_BF: packet was beamformed */ enum mac80211_rx_vht_flags { RX_VHT_FLAG_80MHZ = BIT(0), RX_VHT_FLAG_80P80MHZ = BIT(1), RX_VHT_FLAG_160MHZ = BIT(2), + RX_VHT_FLAG_BF = BIT(3), }; /** |