Merge branch 'fixes' into next

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index efec6ec,0ccc697..594cd0d
--- 1/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
--- 2/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@@ -108,25 -107,7 +108,25 @@@ static int iwl_send_tx_ant_cfg(struct i
                                    sizeof(tx_ant_cmd), &tx_ant_cmd);
  }
  
- static void iwl_free_fw_paging(struct iwl_mvm *mvm)
 +static int iwl_send_rss_cfg_cmd(struct iwl_mvm *mvm)
 +{
 +      int i;
 +      struct iwl_rss_config_cmd cmd = {
 +              .flags = cpu_to_le32(IWL_RSS_ENABLE),
 +              .hash_mask = IWL_RSS_HASH_TYPE_IPV4_TCP |
 +                           IWL_RSS_HASH_TYPE_IPV4_PAYLOAD |
 +                           IWL_RSS_HASH_TYPE_IPV6_TCP |
 +                           IWL_RSS_HASH_TYPE_IPV6_PAYLOAD,
 +      };
 +
 +      for (i = 0; i < ARRAY_SIZE(cmd.indirection_table); i++)
 +              cmd.indirection_table[i] = i % mvm->trans->num_rx_queues;
 +      memcpy(cmd.secret_key, mvm->secret_key, sizeof(cmd.secret_key));
 +
 +      return iwl_mvm_send_cmd_pdu(mvm, RSS_CONFIG_CMD, 0, sizeof(cmd), &cmd);
 +}
 +
+ void iwl_free_fw_paging(struct iwl_mvm *mvm)
  {
        int i;
  

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/ops.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/tx.c
Simple merge