diff --git a/SOURCES/0001-add-deprecated-ids.patch b/SOURCES/0001-add-deprecated-ids.patch index 9eb54fe..21cfd41 100644 --- a/SOURCES/0001-add-deprecated-ids.patch +++ b/SOURCES/0001-add-deprecated-ids.patch @@ -1,78 +1,66 @@ --- a/src/lpfc_ids.h +++ b/src/lpfc_ids.h -@@ -24,7 +24,6 @@ - #include - - const struct pci_device_id lpfc_id_table[] = { +@@ -27 +26,0 @@ -#ifndef CONFIG_RHEL_DIFFERENCES - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_VIPER, - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FIREFLY, -@@ -55,19 +54,14 @@ - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS_DCSP, - PCI_ANY_ID, PCI_ANY_ID, }, +@@ -58 +56,0 @@ -#endif - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BMID, - PCI_ANY_ID, PCI_ANY_ID, }, +@@ -61 +58,0 @@ -#ifndef CONFIG_RHEL_DIFFERENCES - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BSMB, - PCI_ANY_ID, PCI_ANY_ID, }, +@@ -64 +60,0 @@ -#endif - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR, - PCI_ANY_ID, PCI_ANY_ID, }, +@@ -67 +62,0 @@ -#ifndef CONFIG_RHEL_DIFFERENCES - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HORNET, - PCI_ANY_ID, PCI_ANY_ID, }, +@@ -70 +64,0 @@ -#endif - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_SCSP, - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_DCSP, -@@ -76,7 +70,6 @@ - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZSMB, - PCI_ANY_ID, PCI_ANY_ID, }, +@@ -79 +72,0 @@ -#ifndef CONFIG_RHEL_DIFFERENCES - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_TFLY, - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP101, -@@ -87,7 +80,6 @@ - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LPE11000S, - PCI_ANY_ID, PCI_ANY_ID, }, +@@ -90 +82,0 @@ -#endif - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT, - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_MID, -@@ -100,7 +92,6 @@ - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_S, - PCI_ANY_ID, PCI_ANY_ID, }, +@@ -103 +94,0 @@ -#ifndef CONFIG_RHEL_DIFFERENCES - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_VF, - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_PF, -@@ -111,23 +102,18 @@ - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_SERVERENGINE, PCI_DEVICE_ID_TOMCAT, - PCI_ANY_ID, PCI_ANY_ID, }, +@@ -114 +104,0 @@ -#endif - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FALCON, - PCI_ANY_ID, PCI_ANY_ID, }, +@@ -117 +106,0 @@ -#ifndef CONFIG_RHEL_DIFFERENCES - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BALIUS, - PCI_ANY_ID, PCI_ANY_ID, }, +@@ -120 +108,0 @@ -#endif - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC, - PCI_ANY_ID, PCI_ANY_ID, }, +@@ -123 +110,0 @@ -#ifndef CONFIG_RHEL_DIFFERENCES - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FCOE, - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC_VF, - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FCOE_VF, - PCI_ANY_ID, PCI_ANY_ID, }, +@@ -130 +116,0 @@ +-#endif +@@ -144,4 +129,0 @@ +-#ifdef CONFIG_RHEL_DIFFERENCES +-static const struct pci_device_id rh_deprecated_pci_table[] = { +- { 0 } +-}; +@@ -149,20 +130,0 @@ +-static const struct pci_device_id rh_unmaintained_pci_table[] = { +- {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SKYHAWK, +- PCI_ANY_ID, PCI_ANY_ID, }, +- {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC, +- PCI_ANY_ID, PCI_ANY_ID, }, +- {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT, +- PCI_ANY_ID, PCI_ANY_ID, }, +- {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_MID, +- PCI_ANY_ID, PCI_ANY_ID, }, +- {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_SMB, +- PCI_ANY_ID, PCI_ANY_ID, }, +- {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_S, +- PCI_ANY_ID, PCI_ANY_ID, }, +- { 0 } +-}; +- +-static const struct pci_device_id rh_disabled_pci_table[] = { +- { 0 } +-}; +-#endif +--- a/src/lpfc_init.c ++++ b/src/lpfc_init.c +@@ -15276,7 +15275,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 - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G6_FC, - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G7_FC,