Merge tag 'mac80211-next-for-davem-2016-02-26' into next2

Here's another round of updates for -next:
 * big A-MSDU RX performance improvement (avoid linearize of paged RX)
 * rfkill changes: cleanups, documentation, platform properties
 * basic PBSS support in cfg80211
 * MU-MIMO action frame processing support
 * BlockAck reordering & duplicate detection offload support
 * various cleanups & little fixes

25 files changed, 121 insertions, 94 deletions

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 6146a293601a..368de5e5a04f 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -6366,12 +6366,13 @@ static u64 ath10k_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
 
 static int ath10k_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, bool amsdu)
+                               struct ieee80211_ampdu_params *params)
 {
         struct ath10k *ar = hw->priv;
         struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);
+        struct ieee80211_sta *sta = params->sta;
+        enum ieee80211_ampdu_mlme_action action = params->action;
+        u16 tid = params->tid;
 
         ath10k_dbg(ar, ATH10K_DBG_MAC, "mac ampdu vdev_id %i sta %pM tid %hu action %d\n",
                    arvif->vdev_id, sta->addr, tid, action);
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index fe1fd1a5ae15..639294a9e34d 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -1657,13 +1657,14 @@ static void ath9k_htc_reset_tsf(struct ieee80211_hw *hw,
 
 static int ath9k_htc_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, bool amsdu)
+                                  struct ieee80211_ampdu_params *params)
 {
         struct ath9k_htc_priv *priv = hw->priv;
         struct ath9k_htc_sta *ista;
         int ret = 0;
+        struct ieee80211_sta *sta = params->sta;
+        enum ieee80211_ampdu_mlme_action action = params->action;
+        u16 tid = params->tid;
 
         mutex_lock(&priv->mutex);
         ath9k_htc_ps_wakeup(priv);
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index c1b33fdcca08..cf58a304e9f0 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1864,14 +1864,16 @@ static void ath9k_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
 
 static int ath9k_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, bool amsdu)
+                              struct ieee80211_ampdu_params *params)
 {
         struct ath_softc *sc = hw->priv;
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         bool flush = false;
         int ret = 0;
+        struct ieee80211_sta *sta = params->sta;
+        enum ieee80211_ampdu_mlme_action action = params->action;
+        u16 tid = params->tid;
+        u16 *ssn = &params->ssn;
 
         mutex_lock(&sc->mutex);
 
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index 19d3d64416bf..4d1527a2e292 100644
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -1413,10 +1413,12 @@ static void carl9170_ampdu_work(struct work_struct *work)
 
 static int carl9170_op_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, bool amsdu)
+                                    struct ieee80211_ampdu_params *params)
 {
+        struct ieee80211_sta *sta = params->sta;
+        enum ieee80211_ampdu_mlme_action action = params->action;
+        u16 tid = params->tid;
+        u16 *ssn = &params->ssn;
         struct ar9170 *ar = hw->priv;
         struct carl9170_sta_info *sta_info = (void *) sta->drv_priv;
         struct carl9170_sta_tid *tid_info;
diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
index 7c169abdbafe..a27279c2c695 100644
--- a/drivers/net/wireless/ath/wcn36xx/main.c
+++ b/drivers/net/wireless/ath/wcn36xx/main.c
@@ -857,12 +857,14 @@ static int wcn36xx_resume(struct ieee80211_hw *hw)
 
 static int wcn36xx_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, bool amsdu)
+                    struct ieee80211_ampdu_params *params)
 {
         struct wcn36xx *wcn = hw->priv;
         struct wcn36xx_sta *sta_priv = NULL;
+        struct ieee80211_sta *sta = params->sta;
+        enum ieee80211_ampdu_mlme_action action = params->action;
+        u16 tid = params->tid;
+        u16 *ssn = &params->ssn;
 
         wcn36xx_dbg(WCN36XX_DBG_MAC, "mac ampdu action action %d tid %d\n",
                     action, tid);
diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c
index 20d07ef679e8..1f231cd08138 100644
--- a/drivers/net/wireless/ath/wil6210/cfg80211.c
+++ b/drivers/net/wireless/ath/wil6210/cfg80211.c
@@ -422,6 +422,11 @@ static int wil_cfg80211_connect(struct wiphy *wiphy,
         if (sme->privacy && !rsn_eid)
                 wil_info(wil, "WSC connection\n");
 
+        if (sme->pbss) {
+                wil_err(wil, "connect - PBSS not yet supported\n");
+                return -EOPNOTSUPP;
+        }
+
         bss = cfg80211_get_bss(wiphy, sme->channel, sme->bssid,
                                sme->ssid, sme->ssid_len,
                                IEEE80211_BSS_TYPE_ESS, IEEE80211_PRIVACY_ANY);
@@ -870,6 +875,11 @@ static int wil_cfg80211_start_ap(struct wiphy *wiphy,
                 return -EINVAL;
         }
 
+        if (info->pbss) {
+                wil_err(wil, "AP: PBSS not yet supported\n");
+                return -EOPNOTSUPP;
+        }
+
         switch (info->hidden_ssid) {
         case NL80211_HIDDEN_SSID_NOT_IN_USE:
                 hidden_ssid = WMI_HIDDEN_SSID_DISABLED;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
index bec2dc1ca2e4..61ae2768132a 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
@@ -818,13 +818,15 @@ brcms_ops_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 static int
 brcms_ops_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, bool amsdu)
+                    struct ieee80211_ampdu_params *params)
 {
         struct brcms_info *wl = hw->priv;
         struct scb *scb = &wl->wlc->pri_scb;
         int status;
+        struct ieee80211_sta *sta = params->sta;
+        enum ieee80211_ampdu_mlme_action action = params->action;
+        u16 tid = params->tid;
+        u8 buf_size = params->buf_size;
 
         if (WARN_ON(scb->magic != SCB_MAGIC))
                 return -EIDRM;
diff --git a/drivers/net/wireless/intel/iwlegacy/4965-mac.c b/drivers/net/wireless/intel/iwlegacy/4965-mac.c
index fd38aa0763e4..b75f4ef3cdc7 100644
--- a/drivers/net/wireless/intel/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/intel/iwlegacy/4965-mac.c
@@ -5982,12 +5982,14 @@ il4965_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 
 int
 il4965_mac_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, bool amsdu)
+                        struct ieee80211_ampdu_params *params)
 {
         struct il_priv *il = hw->priv;
         int ret = -EINVAL;
+        struct ieee80211_sta *sta = params->sta;
+        enum ieee80211_ampdu_mlme_action action = params->action;
+        u16 tid = params->tid;
+        u16 *ssn = &params->ssn;
 
         D_HT("A-MPDU action on addr %pM tid %d\n", sta->addr, tid);
 
diff --git a/drivers/net/wireless/intel/iwlegacy/4965.h b/drivers/net/wireless/intel/iwlegacy/4965.h
index 8ab8706f9422..e432715e02d8 100644
--- a/drivers/net/wireless/intel/iwlegacy/4965.h
+++ b/drivers/net/wireless/intel/iwlegacy/4965.h
@@ -182,9 +182,7 @@ void il4965_mac_update_tkip_key(struct ieee80211_hw *hw,
                                 struct ieee80211_sta *sta, u32 iv32,
                                 u16 *phase1key);
 int il4965_mac_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, bool amsdu);
+                            struct ieee80211_ampdu_params *params);
 int il4965_mac_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                        struct ieee80211_sta *sta);
 void
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/lib.c b/drivers/net/wireless/intel/iwlwifi/dvm/lib.c
index 4841be2aa499..1799469268ea 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/lib.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/lib.c
@@ -943,14 +943,16 @@ static void iwlagn_wowlan_program_keys(struct ieee80211_hw *hw,
         switch (key->cipher) {
         case WLAN_CIPHER_SUITE_TKIP:
                 if (sta) {
+                        u64 pn64;
+
                         tkip_sc = data->rsc_tsc->all_tsc_rsc.tkip.unicast_rsc;
                         tkip_tx_sc = &data->rsc_tsc->all_tsc_rsc.tkip.tsc;
 
                         rx_p1ks = data->tkip->rx_uni;
 
-                        ieee80211_get_key_tx_seq(key, &seq);
-                        tkip_tx_sc->iv16 = cpu_to_le16(seq.tkip.iv16);
-                        tkip_tx_sc->iv32 = cpu_to_le32(seq.tkip.iv32);
+                        pn64 = atomic64_read(&key->tx_pn);
+                        tkip_tx_sc->iv16 = cpu_to_le16(TKIP_PN_TO_IV16(pn64));
+                        tkip_tx_sc->iv32 = cpu_to_le32(TKIP_PN_TO_IV32(pn64));
 
                         ieee80211_get_tkip_p1k_iv(key, seq.tkip.iv32, p1k);
                         iwlagn_convert_p1k(p1k, data->tkip->tx.p1k);
@@ -996,19 +998,13 @@ static void iwlagn_wowlan_program_keys(struct ieee80211_hw *hw,
                 break;
         case WLAN_CIPHER_SUITE_CCMP:
                 if (sta) {
-                        u8 *pn = seq.ccmp.pn;
+                        u64 pn64;
 
                         aes_sc = data->rsc_tsc->all_tsc_rsc.aes.unicast_rsc;
                         aes_tx_sc = &data->rsc_tsc->all_tsc_rsc.aes.tsc;
 
-                        ieee80211_get_key_tx_seq(key, &seq);
-                        aes_tx_sc->pn = cpu_to_le64(
-                                        (u64)pn[5] |
-                                        ((u64)pn[4] << 8) |
-                                        ((u64)pn[3] << 16) |
-                                        ((u64)pn[2] << 24) |
-                                        ((u64)pn[1] << 32) |
-                                        ((u64)pn[0] << 40));
+                        pn64 = atomic64_read(&key->tx_pn);
+                        aes_tx_sc->pn = cpu_to_le64(pn64);
                 } else
                         aes_sc = data->rsc_tsc->all_tsc_rsc.aes.multicast_rsc;
 
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c
index 4db4cb7aa73a..c63ea79571ff 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c
@@ -732,12 +732,15 @@ static inline bool iwl_enable_tx_ampdu(const struct iwl_cfg *cfg)
 
 static int iwlagn_mac_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, bool amsdu)
+                                   struct ieee80211_ampdu_params *params)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         int ret = -EINVAL;
+        struct ieee80211_sta *sta = params->sta;
+        enum ieee80211_ampdu_mlme_action action = params->action;
+        u16 tid = params->tid;
+        u16 *ssn = &params->ssn;
+        u8 buf_size = params->buf_size;
         struct iwl_station_priv *sta_priv = (void *) sta->drv_priv;
 
         IWL_DEBUG_HT(priv, "A-MPDU action on addr %pM tid %d\n",
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
index 346376187ef8..5214482a0403 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
@@ -251,16 +251,19 @@ static void iwl_mvm_wowlan_program_keys(struct ieee80211_hw *hw,
                 return;
         case WLAN_CIPHER_SUITE_TKIP:
                 if (sta) {
+                        u64 pn64;
+
                         tkip_sc = data->rsc_tsc->all_tsc_rsc.tkip.unicast_rsc;
                         tkip_tx_sc = &data->rsc_tsc->all_tsc_rsc.tkip.tsc;
 
                         rx_p1ks = data->tkip->rx_uni;
 
-                        ieee80211_get_key_tx_seq(key, &seq);
-                        tkip_tx_sc->iv16 = cpu_to_le16(seq.tkip.iv16);
-                        tkip_tx_sc->iv32 = cpu_to_le32(seq.tkip.iv32);
+                        pn64 = atomic64_read(&key->tx_pn);
+                        tkip_tx_sc->iv16 = cpu_to_le16(TKIP_PN_TO_IV16(pn64));
+                        tkip_tx_sc->iv32 = cpu_to_le32(TKIP_PN_TO_IV32(pn64));
 
-                        ieee80211_get_tkip_p1k_iv(key, seq.tkip.iv32, p1k);
+                        ieee80211_get_tkip_p1k_iv(key, TKIP_PN_TO_IV32(pn64),
+                                                  p1k);
                         iwl_mvm_convert_p1k(p1k, data->tkip->tx.p1k);
 
                         memcpy(data->tkip->mic_keys.tx,
@@ -1614,7 +1617,9 @@ static void iwl_mvm_d3_update_keys(struct ieee80211_hw *hw,
                 case WLAN_CIPHER_SUITE_TKIP:
                         iwl_mvm_tkip_sc_to_seq(&sc->tkip.tsc, &seq);
                         iwl_mvm_set_tkip_rx_seq(sc->tkip.unicast_rsc, key);
-                        ieee80211_set_key_tx_seq(key, &seq);
+                        atomic64_set(&key->tx_pn,
+                                     (u64)seq.tkip.iv16 |
+                                     ((u64)seq.tkip.iv32 << 16));
                         break;
                 }
 
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 01476f545695..53156810185d 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -837,13 +837,16 @@ iwl_mvm_ampdu_check_trigger(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 
 static int iwl_mvm_mac_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, bool amsdu)
+                                    struct ieee80211_ampdu_params *params)
 {
         struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
         int ret;
         bool tx_agg_ref = false;
+        struct ieee80211_sta *sta = params->sta;
+        enum ieee80211_ampdu_mlme_action action = params->action;
+        u16 tid = params->tid;
+        u16 *ssn = &params->ssn;
+        u8 buf_size = params->buf_size;
 
         IWL_DEBUG_HT(mvm, "A-MPDU action on addr %pM tid %d: action %d\n",
                      sta->addr, tid, action);
@@ -2582,7 +2585,7 @@ static int iwl_mvm_mac_set_key(struct ieee80211_hw *hw,
         switch (key->cipher) {
         case WLAN_CIPHER_SUITE_TKIP:
                 key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;
-                key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
+                key->flags |= IEEE80211_KEY_FLAG_PUT_IV_SPACE;
                 break;
         case WLAN_CIPHER_SUITE_CCMP:
                 key->flags |= IEEE80211_KEY_FLAG_PUT_IV_SPACE;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
index 5d73db2534a0..caec54ba617a 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
@@ -299,6 +299,8 @@ static void iwl_mvm_set_tx_cmd_crypto(struct iwl_mvm *mvm,
 
         case WLAN_CIPHER_SUITE_TKIP:
                 tx_cmd->sec_ctl = TX_CMD_SEC_TKIP;
+                pn = atomic64_inc_return(&keyconf->tx_pn);
+                ieee80211_tkip_add_iv(crypto_hdr, keyconf, pn);
                 ieee80211_get_tkip_p2k(keyconf, skb_frag, tx_cmd->key);
                 break;
 
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index c32889a1e39c..ee37af1066d2 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -1333,10 +1333,8 @@ static void mac80211_hwsim_tx(struct ieee80211_hw *hw,
         data->tx_bytes += skb->len;
         ack = mac80211_hwsim_tx_frame_no_nl(hw, skb, channel);
 
-        if (ack && skb->len >= 16) {
-                struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        if (ack && skb->len >= 16)
                 mac80211_hwsim_monitor_ack(channel, hdr->addr2);
-        }
 
         ieee80211_tx_info_clear_status(txi);
 
@@ -1845,10 +1843,12 @@ static int mac80211_hwsim_testmode_cmd(struct ieee80211_hw *hw,
 
 static int mac80211_hwsim_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, bool amsdu)
+                                       struct ieee80211_ampdu_params *params)
 {
+        struct ieee80211_sta *sta = params->sta;
+        enum ieee80211_ampdu_mlme_action action = params->action;
+        u16 tid = params->tid;
+
         switch (action) {
         case IEEE80211_AMPDU_TX_START:
                 ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
diff --git a/drivers/net/wireless/marvell/mwl8k.c b/drivers/net/wireless/marvell/mwl8k.c
index 30e3aaae32e2..088429d0a634 100644
--- a/drivers/net/wireless/marvell/mwl8k.c
+++ b/drivers/net/wireless/marvell/mwl8k.c
@@ -5421,11 +5421,13 @@ static int mwl8k_get_survey(struct ieee80211_hw *hw, int idx,
 
 static int
 mwl8k_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, bool amsdu)
+                   struct ieee80211_ampdu_params *params)
 {
-
+        struct ieee80211_sta *sta = params->sta;
+        enum ieee80211_ampdu_mlme_action action = params->action;
+        u16 tid = params->tid;
+        u16 *ssn = &params->ssn;
+        u8 buf_size = params->buf_size;
         int i, rc = 0;
         struct mwl8k_priv *priv = hw->priv;
         struct mwl8k_ampdu_stream *stream;
diff --git a/drivers/net/wireless/mediatek/mt7601u/main.c b/drivers/net/wireless/mediatek/mt7601u/main.c
index f715eee39851..e70dd9523911 100644
--- a/drivers/net/wireless/mediatek/mt7601u/main.c
+++ b/drivers/net/wireless/mediatek/mt7601u/main.c
@@ -334,11 +334,13 @@ static int mt7601u_set_rts_threshold(struct ieee80211_hw *hw, u32 value)
 
 static int
 mt76_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,
-                  bool amsdu)
+                  struct ieee80211_ampdu_params *params)
 {
         struct mt7601u_dev *dev = hw->priv;
+        struct ieee80211_sta *sta = params->sta;
+        enum ieee80211_ampdu_mlme_action action = params->action;
+        u16 tid = params->tid;
+        u16 *ssn = &params->ssn;
         struct mt76_sta *msta = (struct mt76_sta *) sta->drv_priv;
 
         WARN_ON(msta->wcid.idx > GROUP_WCID(0));
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
index 9733b31a780d..69c1c09687a3 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
@@ -7935,10 +7935,11 @@ u64 rt2800_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
 EXPORT_SYMBOL_GPL(rt2800_get_tsf);
 
 int rt2800_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, bool amsdu)
+                        struct ieee80211_ampdu_params *params)
 {
+        struct ieee80211_sta *sta = params->sta;
+        enum ieee80211_ampdu_mlme_action action = params->action;
+        u16 tid = params->tid;
         struct rt2x00_sta *sta_priv = (struct rt2x00_sta *)sta->drv_priv;
         int ret = 0;
 
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
index 440790b92b19..83f1a44fb9b4 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
@@ -218,9 +218,7 @@ int rt2800_conf_tx(struct ieee80211_hw *hw,
                    const struct ieee80211_tx_queue_params *params);
 u64 rt2800_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
 int rt2800_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, bool amsdu);
+                        struct ieee80211_ampdu_params *params);
 int rt2800_get_survey(struct ieee80211_hw *hw, int idx,
                       struct survey_info *survey);
 void rt2800_disable_wpdma(struct rt2x00_dev *rt2x00dev);
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
index 6aed923a709a..7d820c395375 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
@@ -5375,13 +5375,13 @@ static int rtl8xxxu_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 
 static int
 rtl8xxxu_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,
-                      bool amsdu)
+                      struct ieee80211_ampdu_params *params)
 {
         struct rtl8xxxu_priv *priv = hw->priv;
         struct device *dev = &priv->udev->dev;
         u8 ampdu_factor, ampdu_density;
+        struct ieee80211_sta *sta = params->sta;
+        enum ieee80211_ampdu_mlme_action action = params->action;
 
         switch (action) {
         case IEEE80211_AMPDU_TX_START:
diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c
index 4ae421ef30d9..f2507610314b 100644
--- a/drivers/net/wireless/realtek/rtlwifi/core.c
+++ b/drivers/net/wireless/realtek/rtlwifi/core.c
@@ -1371,11 +1371,13 @@ static void rtl_op_sta_notify(struct ieee80211_hw *hw,
 
 static int rtl_op_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, bool amsdu)
+                               struct ieee80211_ampdu_params *params)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct ieee80211_sta *sta = params->sta;
+        enum ieee80211_ampdu_mlme_action action = params->action;
+        u16 tid = params->tid;
+        u16 *ssn = &params->ssn;
 
         switch (action) {
         case IEEE80211_AMPDU_TX_START:
diff --git a/drivers/net/wireless/rsi/rsi_91x_mac80211.c b/drivers/net/wireless/rsi/rsi_91x_mac80211.c
index b5bcc933a2a6..4df992de7d07 100644
--- a/drivers/net/wireless/rsi/rsi_91x_mac80211.c
+++ b/drivers/net/wireless/rsi/rsi_91x_mac80211.c
@@ -659,29 +659,24 @@ static int rsi_mac80211_set_key(struct ieee80211_hw *hw,
  *                               informs the f/w regarding this.
  * @hw: Pointer to the ieee80211_hw structure.
  * @vif: Pointer to the ieee80211_vif structure.
- * @action: ieee80211_ampdu_mlme_action enum.
- * @sta: Pointer to the ieee80211_sta structure.
- * @tid: Traffic identifier.
- * @ssn: Pointer to ssn value.
- * @buf_size: Buffer size (for kernel version > 2.6.38).
- * @amsdu: is AMSDU in AMPDU allowed
+ * @params: Pointer to A-MPDU action parameters
  *
  * Return: status: 0 on success, negative error code on failure.
  */
 static int rsi_mac80211_ampdu_action(struct ieee80211_hw *hw,
                                      struct ieee80211_vif *vif,
-                                     enum ieee80211_ampdu_mlme_action action,
-                                     struct ieee80211_sta *sta,
-                                     unsigned short tid,
-                                     unsigned short *ssn,
-                                     unsigned char buf_size,
-                                     bool amsdu)
+                                     struct ieee80211_ampdu_params *params)
 {
         int status = -EOPNOTSUPP;
         struct rsi_hw *adapter = hw->priv;
         struct rsi_common *common = adapter->priv;
         u16 seq_no = 0;
         u8 ii = 0;
+        struct ieee80211_sta *sta = params->sta;
+        enum ieee80211_ampdu_mlme_action action = params->action;
+        u16 tid = params->tid;
+        u16 *ssn = &params->ssn;
+        u8 buf_size = params->buf_size;
 
         for (ii = 0; ii < RSI_MAX_VIFS; ii++) {
                 if (vif == adapter->vifs[ii])
diff --git a/drivers/net/wireless/st/cw1200/sta.c b/drivers/net/wireless/st/cw1200/sta.c
index 06321c799c90..d0ddcde6c695 100644
--- a/drivers/net/wireless/st/cw1200/sta.c
+++ b/drivers/net/wireless/st/cw1200/sta.c
@@ -2129,9 +2129,7 @@ void cw1200_mcast_timeout(unsigned long arg)
 
 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, bool amsdu)
+                        struct ieee80211_ampdu_params *params)
 {
         /* Aggregation is implemented fully in firmware,
          * including block ack negotiation. Do not allow
diff --git a/drivers/net/wireless/st/cw1200/sta.h b/drivers/net/wireless/st/cw1200/sta.h
index bebb3379017f..a0bacaa39b31 100644
--- a/drivers/net/wireless/st/cw1200/sta.h
+++ b/drivers/net/wireless/st/cw1200/sta.h
@@ -109,9 +109,7 @@ void cw1200_bss_info_changed(struct ieee80211_hw *dev,
                              u32 changed);
 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, bool amsdu);
+                        struct ieee80211_ampdu_params *params);
 
 void cw1200_suspend_resume(struct cw1200_common *priv,
                           struct wsm_suspend_resume *arg);
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index d1109c4f0f0d..45662cf3169f 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -5187,14 +5187,16 @@ out:
 
 static int wl1271_op_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, bool amsdu)
+                                  struct ieee80211_ampdu_params *params)
 {
         struct wl1271 *wl = hw->priv;
         struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         int ret;
         u8 hlid, *ba_bitmap;
+        struct ieee80211_sta *sta = params->sta;
+        enum ieee80211_ampdu_mlme_action action = params->action;
+        u16 tid = params->tid;
+        u16 *ssn = &params->ssn;
 
         wl1271_debug(DEBUG_MAC80211, "mac80211 ampdu action %d tid %d", action,
                      tid);