diff --git a/kernel/linux/igb_uio/compat.h b/kernel/linux/igb_uio/compat.h
index 8dbb896ae..2642e6933 100644
--- a/kernel/linux/igb_uio/compat.h
+++ b/kernel/linux/igb_uio/compat.h
@@ -130,10 +130,6 @@ static bool pci_check_and_mask_intx(struct pci_dev *pdev)
 #define HAVE_MSI_LIST_IN_GENERIC_DEVICE 1
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
-#define HAVE_PCI_MSI_MASK_IRQ 1
-#endif
-
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
 #define HAVE_ALLOC_IRQ_VECTORS 1
 #endif
diff --git a/kernel/linux/igb_uio/igb_uio.c b/kernel/linux/igb_uio/igb_uio.c
index 039f5a5f6..986b415a8 100644
--- a/kernel/linux/igb_uio/igb_uio.c
+++ b/kernel/linux/igb_uio/igb_uio.c
@@ -32,6 +32,12 @@ struct rte_uio_pci_dev {
 static int wc_activate;
 static char *intr_mode;
 static enum rte_intr_mode igbuio_intr_mode_preferred = RTE_INTR_MODE_MSIX;
+
+static int
+igbuio_pci_enable_interrupts(struct rte_uio_pci_dev *udev);
+static void
+igbuio_pci_disable_interrupts(struct rte_uio_pci_dev *udev);
+
 /* sriov sysfs */
 static ssize_t
 show_max_vfs(struct device *dev, struct device_attribute *attr,
@@ -72,75 +78,6 @@ static const struct attribute_group dev_attr_grp = {
 	.attrs = dev_attrs,
 };
 
-#ifndef HAVE_PCI_MSI_MASK_IRQ
-/*
- * It masks the msix on/off of generating MSI-X messages.
- */
-static void
-igbuio_msix_mask_irq(struct msi_desc *desc, s32 state)
-{
-	u32 mask_bits = desc->masked;
-	unsigned int offset = desc->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +
-						PCI_MSIX_ENTRY_VECTOR_CTRL;
-
-	if (state != 0)
-		mask_bits &= ~PCI_MSIX_ENTRY_CTRL_MASKBIT;
-	else
-		mask_bits |= PCI_MSIX_ENTRY_CTRL_MASKBIT;
-
-	if (mask_bits != desc->masked) {
-		writel(mask_bits, desc->mask_base + offset);
-		readl(desc->mask_base);
-		desc->masked = mask_bits;
-	}
-}
-
-/*
- * It masks the msi on/off of generating MSI messages.
- */
-static void
-igbuio_msi_mask_irq(struct pci_dev *pdev, struct msi_desc *desc, int32_t state)
-{
-	u32 mask_bits = desc->masked;
-	u32 offset = desc->irq - pdev->irq;
-	u32 mask = 1 << offset;
-
-	if (!desc->msi_attrib.maskbit)
-		return;
-
-	if (state != 0)
-		mask_bits &= ~mask;
-	else
-		mask_bits |= mask;
-
-	if (mask_bits != desc->masked) {
-		pci_write_config_dword(pdev, desc->mask_pos, mask_bits);
-		desc->masked = mask_bits;
-	}
-}
-
-static void
-igbuio_mask_irq(struct pci_dev *pdev, enum rte_intr_mode mode, s32 irq_state)
-{
-	struct msi_desc *desc;
-	struct list_head *msi_list;
-
-#ifdef HAVE_MSI_LIST_IN_GENERIC_DEVICE
-	msi_list = &pdev->dev.msi_list;
-#else
-	msi_list = &pdev->msi_list;
-#endif
-
-	if (mode == RTE_INTR_MODE_MSIX) {
-		list_for_each_entry(desc, msi_list, list)
-			igbuio_msix_mask_irq(desc, irq_state);
-	} else if (mode == RTE_INTR_MODE_MSI) {
-		list_for_each_entry(desc, msi_list, list)
-			igbuio_msi_mask_irq(pdev, desc, irq_state);
-	}
-}
-#endif
-
 /**
  * This is the irqcontrol callback to be registered to uio_info.
  * It can be used to disable/enable interrupt from user space processes.
@@ -158,31 +95,17 @@ static int
 igbuio_pci_irqcontrol(struct uio_info *info, s32 irq_state)
 {
 	struct rte_uio_pci_dev *udev = info->priv;
-	struct pci_dev *pdev = udev->pdev;
-
-#ifdef HAVE_PCI_MSI_MASK_IRQ
-	struct irq_data *irq = irq_get_irq_data(udev->info.irq);
-#endif
-
-	pci_cfg_access_lock(pdev);
+	int err = 0;
 
-	if (udev->mode == RTE_INTR_MODE_MSIX || udev->mode == RTE_INTR_MODE_MSI) {
-#ifdef HAVE_PCI_MSI_MASK_IRQ
-		if (irq_state == 1)
-			pci_msi_unmask_irq(irq);
-		else
-			pci_msi_mask_irq(irq);
-#else
-		igbuio_mask_irq(pdev, udev->mode, irq_state);
-#endif
+	if (irq_state == 1) {
+		if (udev->info.irq <= 0)
+			err = igbuio_pci_enable_interrupts(udev);
+	} else {
+		igbuio_pci_disable_interrupts(udev);
+		udev->info.irq = -1;
 	}
 
-	if (udev->mode == RTE_INTR_MODE_LEGACY)
-		pci_intx(pdev, !!irq_state);
-
-	pci_cfg_access_unlock(pdev);
-
-	return 0;
+	return err;
 }
 
 /**