From 548e456ce065bd06f8732f9befaae4108f402ea5 Mon Sep 17 00:00:00 2001 From: Peter Georg Date: Feb 13 2022 17:42:22 +0000 Subject: Update patch --- diff --git a/SOURCES/0001-add-deprecated-ids.patch b/SOURCES/0001-add-deprecated-ids.patch index e4c582f..e70d261 100644 --- a/SOURCES/0001-add-deprecated-ids.patch +++ b/SOURCES/0001-add-deprecated-ids.patch @@ -1,29 +1,39 @@ --- a/src/qla_os.c +++ b/src/qla_os.c -@@ -7811,7 +7811,6 @@ - }; - - static struct pci_device_id qla2xxx_pci_tbl[] = { +@@ -2765,16 +2764,0 @@ +-#ifdef CONFIG_RHEL_DIFFERENCES +-static const struct pci_device_id rh_deprecated_pci_table[] = { +- { 0 } +-}; +- +-static const struct pci_device_id rh_unmaintained_pci_table[] = { +- { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2532) }, +- { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2031) }, +- { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8031) }, +- { 0 } +-}; +- +-static const struct pci_device_id rh_disabled_pci_table[] = { +- { 0 } +-}; +-#endif +@@ -2801,7 +2784,0 @@ +-#ifdef CONFIG_RHEL_DIFFERENCES +- if (pci_hw_disabled(rh_disabled_pci_table, pdev)) +- return -ENODEV; +- +- pci_hw_deprecated(rh_deprecated_pci_table, pdev); +- pci_hw_unmaintained(rh_unmaintained_pci_table, pdev); +-#endif +@@ -7839 +7815,0 @@ -#ifndef CONFIG_RHEL_DIFFERENCES - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) }, - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200) }, - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) }, -@@ -7824,18 +7823,13 @@ - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8432) }, - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5422) }, - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5432) }, +@@ -7852 +7827,0 @@ -#endif - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2532) }, - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2031) }, +@@ -7855 +7829,0 @@ -#ifndef CONFIG_RHEL_DIFFERENCES - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8001) }, - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8021) }, +@@ -7858 +7831,0 @@ -#endif - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8031) }, +@@ -7860 +7832,0 @@ -#ifndef CONFIG_RHEL_DIFFERENCES - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISPF001) }, - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8044) }, +@@ -7863 +7834,0 @@ -#endif - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2071) }, - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2271) }, - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2261) },