Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Pull networking updates from David Miller:

 1) The addition of nftables.  No longer will we need protocol aware
    firewall filtering modules, it can all live in userspace.

    At the core of nftables is a, for lack of a better term, virtual
    machine that executes byte codes to inspect packet or metadata
    (arriving interface index, etc.) and make verdict decisions.

    Besides support for loading packet contents and comparing them, the
    interpreter supports lookups in various datastructures as
    fundamental operations.  For example sets are supports, and
    therefore one could create a set of whitelist IP address entries
    which have ACCEPT verdicts attached to them, and use the appropriate
    byte codes to do such lookups.

    Since the interpreted code is composed in userspace, userspace can
    do things like optimize things before giving it to the kernel.

    Another major improvement is the capability of atomically updating
    portions of the ruleset.  In the existing netfilter implementation,
    one has to update the entire rule set in order to make a change and
    this is very expensive.

    Userspace tools exist to create nftables rules using existing
    netfilter rule sets, but both kernel implementations will need to
    co-exist for quite some time as we transition from the old to the
    new stuff.

    Kudos to Patrick McHardy, Pablo Neira Ayuso, and others who have
    worked so hard on this.

 2) Daniel Borkmann and Hannes Frederic Sowa made several improvements
    to our pseudo-random number generator, mostly used for things like
    UDP port randomization and netfitler, amongst other things.

    In particular the taus88 generater is updated to taus113, and test
    cases are added.

 3) Support 64-bit rates in HTB and TBF schedulers, from Eric Dumazet
    and Yang Yingliang.

 4) Add support for new 577xx tigon3 chips to tg3 driver, from Nithin
    Sujir.

 5) Fix two fatal flaws in TCP dynamic right sizing, from Eric Dumazet,
    Neal Cardwell, and Yuchung Cheng.

 6) Allow IP_TOS and IP_TTL to be specified in sendmsg() ancillary
    control message data, much like other socket option attributes.
    From Francesco Fusco.

 7) Allow applications to specify a cap on the rate computed
    automatically by the kernel for pacing flows, via a new
    SO_MAX_PACING_RATE socket option.  From Eric Dumazet.

 8) Make the initial autotuned send buffer sizing in TCP more closely
    reflect actual needs, from Eric Dumazet.

 9) Currently early socket demux only happens for TCP sockets, but we
    can do it for connected UDP sockets too.  Implementation from Shawn
    Bohrer.

10) Refactor inet socket demux with the goal of improving hash demux
    performance for listening sockets.  With the main goals being able
    to use RCU lookups on even request sockets, and eliminating the
    listening lock contention.  From Eric Dumazet.

11) The bonding layer has many demuxes in it's fast path, and an RCU
    conversion was started back in 3.11, several changes here extend the
    RCU usage to even more locations.  From Ding Tianhong and Wang
    Yufen, based upon suggestions by Nikolay Aleksandrov and Veaceslav
    Falico.

12) Allow stackability of segmentation offloads to, in particular, allow
    segmentation offloading over tunnels.  From Eric Dumazet.

13) Significantly improve the handling of secret keys we input into the
    various hash functions in the inet hashtables, TCP fast open, as
    well as syncookies.  From Hannes Frederic Sowa.  The key fundamental
    operation is "net_get_random_once()" which uses static keys.

    Hannes even extended this to ipv4/ipv6 fragmentation handling and
    our generic flow dissector.

14) The generic driver layer takes care now to set the driver data to
    NULL on device removal, so it's no longer necessary for drivers to
    explicitly set it to NULL any more.  Many drivers have been cleaned
    up in this way, from Jingoo Han.

15) Add a BPF based packet scheduler classifier, from Daniel Borkmann.

16) Improve CRC32 interfaces and generic SKB checksum iterators so that
    SCTP's checksumming can more cleanly be handled.  Also from Daniel
    Borkmann.

17) Add a new PMTU discovery mode, IP_PMTUDISC_INTERFACE, which forces
    using the interface MTU value.  This helps avoid PMTU attacks,
    particularly on DNS servers.  From Hannes Frederic Sowa.

18) Use generic XPS for transmit queue steering rather than internal
    (re-)implementation in virtio-net.  From Jason Wang.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1622 commits)
  random32: add test cases for taus113 implementation
  random32: upgrade taus88 generator to taus113 from errata paper
  random32: move rnd_state to linux/random.h
  random32: add prandom_reseed_late() and call when nonblocking pool becomes initialized
  random32: add periodic reseeding
  random32: fix off-by-one in seeding requirement
  PHY: Add RTL8201CP phy_driver to realtek
  xtsonic: add missing platform_set_drvdata() in xtsonic_probe()
  macmace: add missing platform_set_drvdata() in mace_probe()
  ethernet/arc/arc_emac: add missing platform_set_drvdata() in arc_emac_probe()
  ipv6: protect for_each_sk_fl_rcu in mem_check with rcu_read_lock_bh
  vlan: Implement vlan_dev_get_egress_qos_mask as an inline.
  ixgbe: add warning when max_vfs is out of range.
  igb: Update link modes display in ethtool
  netfilter: push reasm skb through instead of original frag skbs
  ip6_output: fragment outgoing reassembled skb properly
  MAINTAINERS: mv643xx_eth: take over maintainership from Lennart
  net_sched: tbf: support of 64bit rates
  ixgbe: deleting dfwd stations out of order can cause null ptr deref
  ixgbe: fix build err, num_rx_queues is only available with CONFIG_RPS
  ...

1 files changed, 157 insertions, 49 deletions

diff --git a/drivers/net/wireless/iwlwifi/mvm/sta.c b/drivers/net/wireless/iwlwifi/mvm/sta.c
index 44add291531b..329952363a54 100644
--- a/drivers/net/wireless/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/iwlwifi/mvm/sta.c
@@ -66,6 +66,115 @@
 #include "sta.h"
 #include "rs.h"
 
+static void iwl_mvm_add_sta_cmd_v6_to_v5(struct iwl_mvm_add_sta_cmd_v6 *cmd_v6,
+                                         struct iwl_mvm_add_sta_cmd_v5 *cmd_v5)
+{
+        memset(cmd_v5, 0, sizeof(*cmd_v5));
+
+        cmd_v5->add_modify = cmd_v6->add_modify;
+        cmd_v5->tid_disable_tx = cmd_v6->tid_disable_tx;
+        cmd_v5->mac_id_n_color = cmd_v6->mac_id_n_color;
+        memcpy(cmd_v5->addr, cmd_v6->addr, ETH_ALEN);
+        cmd_v5->sta_id = cmd_v6->sta_id;
+        cmd_v5->modify_mask = cmd_v6->modify_mask;
+        cmd_v5->station_flags = cmd_v6->station_flags;
+        cmd_v5->station_flags_msk = cmd_v6->station_flags_msk;
+        cmd_v5->add_immediate_ba_tid = cmd_v6->add_immediate_ba_tid;
+        cmd_v5->remove_immediate_ba_tid = cmd_v6->remove_immediate_ba_tid;
+        cmd_v5->add_immediate_ba_ssn = cmd_v6->add_immediate_ba_ssn;
+        cmd_v5->sleep_tx_count = cmd_v6->sleep_tx_count;
+        cmd_v5->sleep_state_flags = cmd_v6->sleep_state_flags;
+        cmd_v5->assoc_id = cmd_v6->assoc_id;
+        cmd_v5->beamform_flags = cmd_v6->beamform_flags;
+        cmd_v5->tfd_queue_msk = cmd_v6->tfd_queue_msk;
+}
+
+static void
+iwl_mvm_add_sta_key_to_add_sta_cmd_v5(struct iwl_mvm_add_sta_key_cmd *key_cmd,
+                                      struct iwl_mvm_add_sta_cmd_v5 *sta_cmd,
+                                      u32 mac_id_n_color)
+{
+        memset(sta_cmd, 0, sizeof(*sta_cmd));
+
+        sta_cmd->sta_id = key_cmd->sta_id;
+        sta_cmd->add_modify = STA_MODE_MODIFY;
+        sta_cmd->modify_mask = STA_MODIFY_KEY;
+        sta_cmd->mac_id_n_color = cpu_to_le32(mac_id_n_color);
+
+        sta_cmd->key.key_offset = key_cmd->key_offset;
+        sta_cmd->key.key_flags = key_cmd->key_flags;
+        memcpy(sta_cmd->key.key, key_cmd->key, sizeof(sta_cmd->key.key));
+        sta_cmd->key.tkip_rx_tsc_byte2 = key_cmd->tkip_rx_tsc_byte2;
+        memcpy(sta_cmd->key.tkip_rx_ttak, key_cmd->tkip_rx_ttak,
+               sizeof(sta_cmd->key.tkip_rx_ttak));
+}
+
+static int iwl_mvm_send_add_sta_cmd_status(struct iwl_mvm *mvm,
+                                           struct iwl_mvm_add_sta_cmd_v6 *cmd,
+                                           int *status)
+{
+        struct iwl_mvm_add_sta_cmd_v5 cmd_v5;
+
+        if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_STA_KEY_CMD)
+                return iwl_mvm_send_cmd_pdu_status(mvm, ADD_STA, sizeof(*cmd),
+                                                   cmd, status);
+
+        iwl_mvm_add_sta_cmd_v6_to_v5(cmd, &cmd_v5);
+
+        return iwl_mvm_send_cmd_pdu_status(mvm, ADD_STA, sizeof(cmd_v5),
+                                           &cmd_v5, status);
+}
+
+static int iwl_mvm_send_add_sta_cmd(struct iwl_mvm *mvm, u32 flags,
+                                    struct iwl_mvm_add_sta_cmd_v6 *cmd)
+{
+        struct iwl_mvm_add_sta_cmd_v5 cmd_v5;
+
+        if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_STA_KEY_CMD)
+                return iwl_mvm_send_cmd_pdu(mvm, ADD_STA, flags,
+                                            sizeof(*cmd), cmd);
+
+        iwl_mvm_add_sta_cmd_v6_to_v5(cmd, &cmd_v5);
+
+        return iwl_mvm_send_cmd_pdu(mvm, ADD_STA, flags, sizeof(cmd_v5),
+                                    &cmd_v5);
+}
+
+static int
+iwl_mvm_send_add_sta_key_cmd_status(struct iwl_mvm *mvm,
+                                    struct iwl_mvm_add_sta_key_cmd *cmd,
+                                    u32 mac_id_n_color,
+                                    int *status)
+{
+        struct iwl_mvm_add_sta_cmd_v5 sta_cmd;
+
+        if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_STA_KEY_CMD)
+                return iwl_mvm_send_cmd_pdu_status(mvm, ADD_STA_KEY,
+                                                   sizeof(*cmd), cmd, status);
+
+        iwl_mvm_add_sta_key_to_add_sta_cmd_v5(cmd, &sta_cmd, mac_id_n_color);
+
+        return iwl_mvm_send_cmd_pdu_status(mvm, ADD_STA, sizeof(sta_cmd),
+                                           &sta_cmd, status);
+}
+
+static int iwl_mvm_send_add_sta_key_cmd(struct iwl_mvm *mvm,
+                                        u32 flags,
+                                        struct iwl_mvm_add_sta_key_cmd *cmd,
+                                        u32 mac_id_n_color)
+{
+        struct iwl_mvm_add_sta_cmd_v5 sta_cmd;
+
+        if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_STA_KEY_CMD)
+                return iwl_mvm_send_cmd_pdu(mvm, ADD_STA_KEY, flags,
+                                            sizeof(*cmd), cmd);
+
+        iwl_mvm_add_sta_key_to_add_sta_cmd_v5(cmd, &sta_cmd, mac_id_n_color);
+
+        return iwl_mvm_send_cmd_pdu(mvm, ADD_STA, flags, sizeof(sta_cmd),
+                                    &sta_cmd);
+}
+
 static int iwl_mvm_find_free_sta_id(struct iwl_mvm *mvm)
 {
         int sta_id;
@@ -87,7 +196,7 @@ int iwl_mvm_sta_send_to_fw(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
                            bool update)
 {
         struct iwl_mvm_sta *mvm_sta = (void *)sta->drv_priv;
-        struct iwl_mvm_add_sta_cmd add_sta_cmd;
+        struct iwl_mvm_add_sta_cmd_v6 add_sta_cmd;
         int ret;
         u32 status;
         u32 agg_size = 0, mpdu_dens = 0;
@@ -175,8 +284,7 @@ int iwl_mvm_sta_send_to_fw(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
                 cpu_to_le32(mpdu_dens << STA_FLG_AGG_MPDU_DENS_SHIFT);
 
         status = ADD_STA_SUCCESS;
-        ret = iwl_mvm_send_cmd_pdu_status(mvm, ADD_STA, sizeof(add_sta_cmd),
-                                          &add_sta_cmd, &status);
+        ret = iwl_mvm_send_add_sta_cmd_status(mvm, &add_sta_cmd, &status);
         if (ret)
                 return ret;
 
@@ -229,8 +337,12 @@ int iwl_mvm_add_sta(struct iwl_mvm *mvm,
                 if (vif->hw_queue[i] != IEEE80211_INVAL_HW_QUEUE)
                         mvm_sta->tfd_queue_msk |= BIT(vif->hw_queue[i]);
 
-        /* for HW restart - need to reset the seq_number etc... */
-        memset(mvm_sta->tid_data, 0, sizeof(mvm_sta->tid_data));
+        /* for HW restart - reset everything but the sequence number */
+        for (i = 0; i < IWL_MAX_TID_COUNT; i++) {
+                u16 seq = mvm_sta->tid_data[i].seq_number;
+                memset(&mvm_sta->tid_data[i], 0, sizeof(mvm_sta->tid_data[i]));
+                mvm_sta->tid_data[i].seq_number = seq;
+        }
 
         ret = iwl_mvm_sta_send_to_fw(mvm, sta, false);
         if (ret)
@@ -256,7 +368,7 @@ int iwl_mvm_update_sta(struct iwl_mvm *mvm,
 int iwl_mvm_drain_sta(struct iwl_mvm *mvm, struct iwl_mvm_sta *mvmsta,
                       bool drain)
 {
-        struct iwl_mvm_add_sta_cmd cmd = {};
+        struct iwl_mvm_add_sta_cmd_v6 cmd = {};
         int ret;
         u32 status;
 
@@ -269,8 +381,7 @@ int iwl_mvm_drain_sta(struct iwl_mvm *mvm, struct iwl_mvm_sta *mvmsta,
         cmd.station_flags_msk = cpu_to_le32(STA_FLG_DRAIN_FLOW);
 
         status = ADD_STA_SUCCESS;
-        ret = iwl_mvm_send_cmd_pdu_status(mvm, ADD_STA, sizeof(cmd),
-                                          &cmd, &status);
+        ret = iwl_mvm_send_add_sta_cmd_status(mvm, &cmd, &status);
         if (ret)
                 return ret;
 
@@ -469,13 +580,13 @@ static int iwl_mvm_add_int_sta_common(struct iwl_mvm *mvm,
                                       const u8 *addr,
                                       u16 mac_id, u16 color)
 {
-        struct iwl_mvm_add_sta_cmd cmd;
+        struct iwl_mvm_add_sta_cmd_v6 cmd;
         int ret;
         u32 status;
 
         lockdep_assert_held(&mvm->mutex);
 
-        memset(&cmd, 0, sizeof(struct iwl_mvm_add_sta_cmd));
+        memset(&cmd, 0, sizeof(struct iwl_mvm_add_sta_cmd_v6));
         cmd.sta_id = sta->sta_id;
         cmd.mac_id_n_color = cpu_to_le32(FW_CMD_ID_AND_COLOR(mac_id,
                                                              color));
@@ -485,8 +596,7 @@ static int iwl_mvm_add_int_sta_common(struct iwl_mvm *mvm,
         if (addr)
                 memcpy(cmd.addr, addr, ETH_ALEN);
 
-        ret = iwl_mvm_send_cmd_pdu_status(mvm, ADD_STA, sizeof(cmd),
-                                          &cmd, &status);
+        ret = iwl_mvm_send_add_sta_cmd_status(mvm, &cmd, &status);
         if (ret)
                 return ret;
 
@@ -534,10 +644,14 @@ int iwl_mvm_send_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
                            struct iwl_mvm_int_sta *bsta)
 {
         struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
-        static const u8 baddr[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+        static const u8 _baddr[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+        static const u8 *baddr = _baddr;
 
         lockdep_assert_held(&mvm->mutex);
 
+        if (vif->type == NL80211_IFTYPE_ADHOC)
+                baddr = vif->bss_conf.bssid;
+
         if (WARN_ON_ONCE(bsta->sta_id == IWL_MVM_STATION_COUNT))
                 return -ENOSPC;
 
@@ -614,7 +728,7 @@ int iwl_mvm_sta_rx_agg(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
                        int tid, u16 ssn, bool start)
 {
         struct iwl_mvm_sta *mvm_sta = (void *)sta->drv_priv;
-        struct iwl_mvm_add_sta_cmd cmd = {};
+        struct iwl_mvm_add_sta_cmd_v6 cmd = {};
         int ret;
         u32 status;
 
@@ -638,8 +752,7 @@ int iwl_mvm_sta_rx_agg(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
                                   STA_MODIFY_REMOVE_BA_TID;
 
         status = ADD_STA_SUCCESS;
-        ret = iwl_mvm_send_cmd_pdu_status(mvm, ADD_STA, sizeof(cmd),
-                                          &cmd, &status);
+        ret = iwl_mvm_send_add_sta_cmd_status(mvm, &cmd, &status);
         if (ret)
                 return ret;
 
@@ -674,7 +787,7 @@ static int iwl_mvm_sta_tx_agg(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
                               int tid, u8 queue, bool start)
 {
         struct iwl_mvm_sta *mvm_sta = (void *)sta->drv_priv;
-        struct iwl_mvm_add_sta_cmd cmd = {};
+        struct iwl_mvm_add_sta_cmd_v6 cmd = {};
         int ret;
         u32 status;
 
@@ -696,8 +809,7 @@ static int iwl_mvm_sta_tx_agg(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
         cmd.tid_disable_tx = cpu_to_le16(mvm_sta->tid_disable_agg);
 
         status = ADD_STA_SUCCESS;
-        ret = iwl_mvm_send_cmd_pdu_status(mvm, ADD_STA, sizeof(cmd),
-                                          &cmd, &status);
+        ret = iwl_mvm_send_add_sta_cmd_status(mvm, &cmd, &status);
         if (ret)
                 return ret;
 
@@ -743,13 +855,13 @@ int iwl_mvm_sta_tx_agg_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 
         lockdep_assert_held(&mvm->mutex);
 
-        for (txq_id = IWL_MVM_FIRST_AGG_QUEUE;
-             txq_id <= IWL_MVM_LAST_AGG_QUEUE; txq_id++)
+        for (txq_id = mvm->first_agg_queue;
+             txq_id <= mvm->last_agg_queue; txq_id++)
                 if (mvm->queue_to_mac80211[txq_id] ==
                     IWL_INVALID_MAC80211_QUEUE)
                         break;
 
-        if (txq_id > IWL_MVM_LAST_AGG_QUEUE) {
+        if (txq_id > mvm->last_agg_queue) {
                 IWL_ERR(mvm, "Failed to allocate agg queue\n");
                 return -EIO;
         }
@@ -987,10 +1099,11 @@ static int iwl_mvm_send_sta_key(struct iwl_mvm *mvm,
                                 u32 cmd_flags)
 {
         __le16 key_flags;
-        struct iwl_mvm_add_sta_cmd cmd = {};
+        struct iwl_mvm_add_sta_key_cmd cmd = {};
         int ret, status;
         u16 keyidx;
         int i;
+        u32 mac_id_n_color = mvm_sta->mac_id_n_color;
 
         keyidx = (keyconf->keyidx << STA_KEY_FLG_KEYID_POS) &
                  STA_KEY_FLG_KEYID_MSK;
@@ -1000,14 +1113,14 @@ static int iwl_mvm_send_sta_key(struct iwl_mvm *mvm,
         switch (keyconf->cipher) {
         case WLAN_CIPHER_SUITE_TKIP:
                 key_flags |= cpu_to_le16(STA_KEY_FLG_TKIP);
-                cmd.key.tkip_rx_tsc_byte2 = tkip_iv32;
+                cmd.tkip_rx_tsc_byte2 = tkip_iv32;
                 for (i = 0; i < 5; i++)
-                        cmd.key.tkip_rx_ttak[i] = cpu_to_le16(tkip_p1k[i]);
-                memcpy(cmd.key.key, keyconf->key, keyconf->keylen);
+                        cmd.tkip_rx_ttak[i] = cpu_to_le16(tkip_p1k[i]);
+                memcpy(cmd.key, keyconf->key, keyconf->keylen);
                 break;
         case WLAN_CIPHER_SUITE_CCMP:
                 key_flags |= cpu_to_le16(STA_KEY_FLG_CCM);
-                memcpy(cmd.key.key, keyconf->key, keyconf->keylen);
+                memcpy(cmd.key, keyconf->key, keyconf->keylen);
                 break;
         default:
                 WARN_ON(1);
@@ -1017,20 +1130,18 @@ static int iwl_mvm_send_sta_key(struct iwl_mvm *mvm,
         if (!(keyconf->flags & IEEE80211_KEY_FLAG_PAIRWISE))
                 key_flags |= cpu_to_le16(STA_KEY_MULTICAST);
 
-        cmd.mac_id_n_color = cpu_to_le32(mvm_sta->mac_id_n_color);
-        cmd.key.key_offset = keyconf->hw_key_idx;
-        cmd.key.key_flags = key_flags;
-        cmd.add_modify = STA_MODE_MODIFY;
-        cmd.modify_mask = STA_MODIFY_KEY;
+        cmd.key_offset = keyconf->hw_key_idx;
+        cmd.key_flags = key_flags;
         cmd.sta_id = sta_id;
 
         status = ADD_STA_SUCCESS;
         if (cmd_flags == CMD_SYNC)
-                ret = iwl_mvm_send_cmd_pdu_status(mvm, ADD_STA, sizeof(cmd),
-                                                  &cmd, &status);
+                ret = iwl_mvm_send_add_sta_key_cmd_status(mvm, &cmd,
+                                                          mac_id_n_color,
+                                                          &status);
         else
-                ret = iwl_mvm_send_cmd_pdu(mvm, ADD_STA, CMD_ASYNC,
-                                           sizeof(cmd), &cmd);
+                ret = iwl_mvm_send_add_sta_key_cmd(mvm, CMD_ASYNC, &cmd,
+                                                   mac_id_n_color);
 
         switch (status) {
         case ADD_STA_SUCCESS:
@@ -1197,7 +1308,7 @@ int iwl_mvm_remove_sta_key(struct iwl_mvm *mvm,
                            struct ieee80211_key_conf *keyconf)
 {
         struct iwl_mvm_sta *mvm_sta;
-        struct iwl_mvm_add_sta_cmd cmd = {};
+        struct iwl_mvm_add_sta_key_cmd cmd = {};
         __le16 key_flags;
         int ret, status;
         u8 sta_id;
@@ -1252,17 +1363,14 @@ int iwl_mvm_remove_sta_key(struct iwl_mvm *mvm,
         if (!(keyconf->flags & IEEE80211_KEY_FLAG_PAIRWISE))
                 key_flags |= cpu_to_le16(STA_KEY_MULTICAST);
 
-        cmd.mac_id_n_color = cpu_to_le32(mvm_sta->mac_id_n_color);
-        cmd.key.key_flags = key_flags;
-        cmd.key.key_offset = keyconf->hw_key_idx;
+        cmd.key_flags = key_flags;
+        cmd.key_offset = keyconf->hw_key_idx;
         cmd.sta_id = sta_id;
 
-        cmd.modify_mask = STA_MODIFY_KEY;
-        cmd.add_modify = STA_MODE_MODIFY;
-
         status = ADD_STA_SUCCESS;
-        ret = iwl_mvm_send_cmd_pdu_status(mvm, ADD_STA, sizeof(cmd),
-                                          &cmd, &status);
+        ret = iwl_mvm_send_add_sta_key_cmd_status(mvm, &cmd,
+                                                  mvm_sta->mac_id_n_color,
+                                                  &status);
 
         switch (status) {
         case ADD_STA_SUCCESS:
@@ -1309,7 +1417,7 @@ void iwl_mvm_sta_modify_ps_wake(struct iwl_mvm *mvm,
                                 struct ieee80211_sta *sta)
 {
         struct iwl_mvm_sta *mvmsta = (void *)sta->drv_priv;
-        struct iwl_mvm_add_sta_cmd cmd = {
+        struct iwl_mvm_add_sta_cmd_v6 cmd = {
                 .add_modify = STA_MODE_MODIFY,
                 .sta_id = mvmsta->sta_id,
                 .station_flags_msk = cpu_to_le32(STA_FLG_PS),
@@ -1317,7 +1425,7 @@ void iwl_mvm_sta_modify_ps_wake(struct iwl_mvm *mvm,
         };
         int ret;
 
-        ret = iwl_mvm_send_cmd_pdu(mvm, ADD_STA, CMD_ASYNC, sizeof(cmd), &cmd);
+        ret = iwl_mvm_send_add_sta_cmd(mvm, CMD_ASYNC, &cmd);
         if (ret)
                 IWL_ERR(mvm, "Failed to send ADD_STA command (%d)\n", ret);
 }
@@ -1331,7 +1439,7 @@ void iwl_mvm_sta_modify_sleep_tx_count(struct iwl_mvm *mvm,
                 (reason == IEEE80211_FRAME_RELEASE_UAPSD) ?
                         STA_SLEEP_STATE_UAPSD : STA_SLEEP_STATE_PS_POLL;
         struct iwl_mvm_sta *mvmsta = (void *)sta->drv_priv;
-        struct iwl_mvm_add_sta_cmd cmd = {
+        struct iwl_mvm_add_sta_cmd_v6 cmd = {
                 .add_modify = STA_MODE_MODIFY,
                 .sta_id = mvmsta->sta_id,
                 .modify_mask = STA_MODIFY_SLEEPING_STA_TX_COUNT,
@@ -1346,7 +1454,7 @@ void iwl_mvm_sta_modify_sleep_tx_count(struct iwl_mvm *mvm,
         int ret;
 
         /* TODO: somehow the fw doesn't seem to take PS_POLL into account */
-        ret = iwl_mvm_send_cmd_pdu(mvm, ADD_STA, CMD_ASYNC, sizeof(cmd), &cmd);
+        ret = iwl_mvm_send_add_sta_cmd(mvm, CMD_ASYNC, &cmd);
         if (ret)
                 IWL_ERR(mvm, "Failed to send ADD_STA command (%d)\n", ret);
 }