Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Just minor overlapping changes in the conflicts here.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index d7d6f3398f86..4888054dc3d8 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -1088,7 +1088,7 @@ static void iwl_mvm_rx_mq(struct iwl_op_mode *op_mode,
                 iwl_mvm_rx_mpdu_mq(mvm, napi, rxb, 0);
         else if (unlikely(cmd == WIDE_ID(DATA_PATH_GROUP,
                                          RX_QUEUES_NOTIFICATION)))
-                iwl_mvm_rx_queue_notif(mvm, rxb, 0);
+                iwl_mvm_rx_queue_notif(mvm, napi, rxb, 0);
         else if (cmd == WIDE_ID(LEGACY_GROUP, FRAME_RELEASE))
                 iwl_mvm_rx_frame_release(mvm, napi, rxb, 0);
         else if (cmd == WIDE_ID(DATA_PATH_GROUP, RX_NO_DATA_NOTIF))
@@ -1812,7 +1812,7 @@ static void iwl_mvm_rx_mq_rss(struct iwl_op_mode *op_mode,
                 iwl_mvm_rx_frame_release(mvm, napi, rxb, queue);
         else if (unlikely(cmd == WIDE_ID(DATA_PATH_GROUP,
                                          RX_QUEUES_NOTIFICATION)))
-                iwl_mvm_rx_queue_notif(mvm, rxb, queue);
+                iwl_mvm_rx_queue_notif(mvm, napi, rxb, queue);
         else if (likely(cmd == WIDE_ID(LEGACY_GROUP, REPLY_RX_MPDU_CMD)))
                 iwl_mvm_rx_mpdu_mq(mvm, napi, rxb, queue);
 }