diff --git a/.local-symbols b/.local-symbols
index 060c74b..a558d06 100644
--- a/.local-symbols
+++ b/.local-symbols
@@ -279,6 +279,7 @@
 P54_SPI=
 P54_SPI_DEFAULT_EEPROM=
 P54_LEDS=
+QUANTENNA_PCIE_HOST_MPS_FIX=
 RT2X00=
 RT2400PCI=
 RT2500PCI=
diff --git a/drivers/net/wireless/quantenna/Kconfig b/drivers/net/wireless/quantenna/Kconfig
index 73c81ad..878e558 100644
--- a/drivers/net/wireless/quantenna/Kconfig
+++ b/drivers/net/wireless/quantenna/Kconfig
@@ -3,4 +3,9 @@
 		tristate "PCIe host"
 		default n
 		depends on m
+
+	config QUANTENNA_PCIE_HOST_MPS_FIX
+		bool "PCIe MPS fix"
+		default n
+		depends on QUANTENNA_PCIE_HOST
 endmenu
diff --git a/drivers/net/wireless/quantenna/pcie2/host/common/qdpc_init.c b/drivers/net/wireless/quantenna/pcie2/host/common/qdpc_init.c
index ba8cce3..d024363 100644
--- a/drivers/net/wireless/quantenna/pcie2/host/common/qdpc_init.c
+++ b/drivers/net/wireless/quantenna/pcie2/host/common/qdpc_init.c
@@ -361,6 +361,10 @@
 		PRINT_DBG(KERN_INFO "The device %x has PCI Express capability\n", pdev->device);
 	}
 
+#ifdef CPTCFG_QUANTENNA_PCIE_HOST_MPS_FIX
+	qdpc_tune_pcie_mps(pdev, pos);
+#endif
+
 	/*  Wake up the device if it is in suspended state and allocate IO,
 	 *  memory regions and IRQ if not
 	 */