diff options
| author | David S. Miller <davem@davemloft.net> | 2015-10-07 13:29:18 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-07 13:29:18 +0200 |
| commit | 2579c98f0d04075ab8b041de7d5396393d2417f1 (patch) | |
| tree | 094fb6486f5ede529cd772223d2fa0334a28f852 /drivers/net/wireless/cw1200/sta.h | |
| parent | Merge branch 'l3mdev_saddr_op' (diff) | |
| parent | mac80211: make ieee80211_new_mesh_header return unsigned (diff) | |
| download | linux-2579c98f0d04075ab8b041de7d5396393d2417f1.tar.xz 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 'drivers/net/wireless/cw1200/sta.h')
| -rw-r--r-- | drivers/net/wireless/cw1200/sta.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/cw1200/sta.h b/drivers/net/wireless/cw1200/sta.h index b7e386b7662b..bebb3379017f 100644 --- a/drivers/net/wireless/cw1200/sta.h +++ b/drivers/net/wireless/cw1200/sta.h @@ -111,7 +111,7 @@ int cw1200_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, enum ieee80211_ampdu_mlme_action action, struct ieee80211_sta *sta, u16 tid, u16 *ssn, - u8 buf_size); + u8 buf_size, bool amsdu); void cw1200_suspend_resume(struct cw1200_common *priv, struct wsm_suspend_resume *arg); |