diff options
| author | David S. Miller <davem@davemloft.net> | 2015-10-07 04:29:18 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-07 04:29:18 -0700 |
| commit | 2579c98f0d04075ab8b041de7d5396393d2417f1 (patch) | |
| tree | 094fb6486f5ede529cd772223d2fa0334a28f852 /net/mac80211/sta_info.h | |
| parent | 390a4bee5c2ade628565dd21fb5d8656a58f7804 (diff) | |
| parent | 5edfcee5ed73eb9537987c4ddb6bf062b6943b73 (diff) | |
| download | blackbird-op-linux-2579c98f0d04075ab8b041de7d5396393d2417f1.tar.gz blackbird-op-linux-2579c98f0d04075ab8b041de7d5396393d2417f1.zip | |
Merge tag 'mac80211-next-for-davem-2015-10-05' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
For the current cycle, we have the following right now:
* many internal fixes, API improvements, cleanups, etc.
* full AP client state tracking in cfg80211/mac80211 from Ayala
* VHT support (in mac80211) for mesh
* some A-MSDU in A-MPDU support from Emmanuel
* show current TX power to userspace (from Rafał)
* support for netlink dump in vendor commands (myself)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/sta_info.h')
| -rw-r--r-- | net/mac80211/sta_info.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index b087c71ff7fe..d5ded8749ac4 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h @@ -133,6 +133,7 @@ enum ieee80211_agg_stop_reason { * @buf_size: reorder buffer size at receiver * @failed_bar_ssn: ssn of the last failed BAR tx attempt * @bar_pending: BAR needs to be re-sent + * @amsdu: support A-MSDU withing A-MDPU * * This structure's lifetime is managed by RCU, assignments to * the array holding it must hold the aggregation mutex. @@ -158,6 +159,7 @@ struct tid_ampdu_tx { u16 failed_bar_ssn; bool bar_pending; + bool amsdu; }; /** |
