From 1809534a1aee5f09392d95f909a6d2355e6818d1 Mon Sep 17 00:00:00 2001
From: Mark Johnston <markj@FreeBSD.org>
Date: Thu, 7 Nov 2019 23:36:10 +0000
Subject: [PATCH] iwm: Define the mqrx_supported capability.

The firmware for 9000-series and newer devices has a different receive
API which supports multiple queues.

MFC after:	2 weeks
Sponsored by:	The FreeBSD Foundation
---
 sys/dev/iwm/if_iwm_9000.c   |  2 ++
 sys/dev/iwm/if_iwm_9260.c   |  1 +
 sys/dev/iwm/if_iwm_config.h | 16 +++++++++-------
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/sys/dev/iwm/if_iwm_9000.c b/sys/dev/iwm/if_iwm_9000.c
index 0bdd361ea3b4..fe7898c5b483 100644
--- a/sys/dev/iwm/if_iwm_9000.c
+++ b/sys/dev/iwm/if_iwm_9000.c
@@ -92,4 +92,6 @@ const struct iwm_cfg iwm9560_cfg = {
 	.fw_name = IWM9000_FW,
 	IWM_DEVICE_9000_COMMON,
 	.host_interrupt_operation_mode = 0,
+	.mqrx_supported = 1,
+	.integrated = 1,
 };
diff --git a/sys/dev/iwm/if_iwm_9260.c b/sys/dev/iwm/if_iwm_9260.c
index e1907624476c..a92ba9ebbe35 100644
--- a/sys/dev/iwm/if_iwm_9260.c
+++ b/sys/dev/iwm/if_iwm_9260.c
@@ -92,4 +92,5 @@ const struct iwm_cfg iwm9260_cfg = {
 	.fw_name = IWM9260_FW,
 	IWM_DEVICE_9260_COMMON,
 	.host_interrupt_operation_mode = 0,
+	.mqrx_supported = 1,
 };
diff --git a/sys/dev/iwm/if_iwm_config.h b/sys/dev/iwm/if_iwm_config.h
index 7d79d5075de7..fabcfaa75184 100644
--- a/sys/dev/iwm/if_iwm_config.h
+++ b/sys/dev/iwm/if_iwm_config.h
@@ -131,13 +131,15 @@ enum iwm_nvm_type {
  */
 struct iwm_cfg {
 	const char *name;
-        const char *fw_name;
-        uint16_t eeprom_size;
-        enum iwm_device_family device_family;
-        int host_interrupt_operation_mode;
-        uint8_t nvm_hw_section_num;
-        int apmg_wake_up_wa;
-        enum iwm_nvm_type nvm_type;
+	const char *fw_name;
+	uint16_t eeprom_size;
+	enum iwm_device_family device_family;
+	int host_interrupt_operation_mode;
+	int mqrx_supported;
+	int integrated;
+	uint8_t nvm_hw_section_num;
+	int apmg_wake_up_wa;
+	enum iwm_nvm_type nvm_type;
 };
 
 /*