diff --git a/SOURCES/0001-add-deprecated-ids.patch b/SOURCES/0001-add-deprecated-ids.patch index 1d7014f..f287e59 100644 --- a/SOURCES/0001-add-deprecated-ids.patch +++ b/SOURCES/0001-add-deprecated-ids.patch @@ -1,6 +1,6 @@ --- a/src/lpfc_attr.c +++ b/src/lpfc_attr.c -@@ -7266,6 +7266,12 @@ +@@ -7553,6 +7553,12 @@ switch (phba->pcidev->device) { case PCI_DEVICE_ID_SKYHAWK: case PCI_DEVICE_ID_SKYHAWK_VF: @@ -15,7 +15,7 @@ default: --- a/src/lpfc_els.c +++ b/src/lpfc_els.c -@@ -3859,6 +3859,15 @@ +@@ -4516,6 +4516,15 @@ case IOSTAT_LOCAL_REJECT: switch ((irsp->un.ulpWord[4] & IOERR_PARAM_MASK)) { case IOERR_LOOP_OPEN_FAILURE: @@ -33,7 +33,7 @@ retry = 1; --- a/src/lpfc_hw.h +++ b/src/lpfc_hw.h -@@ -1569,24 +1569,54 @@ +@@ -1687,25 +1687,55 @@ /* Start FireFly Register definitions */ #define PCI_VENDOR_ID_EMULEX 0x10df @@ -47,6 +47,7 @@ +#define PCI_DEVICE_ID_LANCER_FCOE_VF 0xe268 #define PCI_DEVICE_ID_LANCER_G6_FC 0xe300 #define PCI_DEVICE_ID_LANCER_G7_FC 0xf400 + #define PCI_DEVICE_ID_LANCER_G7P_FC 0xf500 #define PCI_DEVICE_ID_SAT_SMB 0xf011 #define PCI_DEVICE_ID_SAT_MID 0xf015 +#define PCI_DEVICE_ID_RFLY 0xf095 @@ -88,7 +89,7 @@ #define PCI_DEVICE_ID_SKYHAWK 0x0724 #define PCI_DEVICE_ID_SKYHAWK_VF 0x072c -@@ -4205,11 +4235,16 @@ +@@ -4324,11 +4354,16 @@ static inline int lpfc_is_LC_HBA(unsigned short device) { @@ -202,7 +203,7 @@ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G7_FC, --- a/src/lpfc_init.c +++ b/src/lpfc_init.c -@@ -2362,9 +2362,83 @@ +@@ -2468,9 +2468,83 @@ vp = &phba->vpd; switch (dev_id) { @@ -286,7 +287,7 @@ case PCI_DEVICE_ID_ZEPHYR: m = (typeof(m)){"LPe11000", "PCIe", "Fibre Channel Adapter"}; break; -@@ -2381,6 +2455,22 @@ +@@ -2487,6 +2561,22 @@ case PCI_DEVICE_ID_ZSMB: m = (typeof(m)){"LPe111", "PCIe", "Fibre Channel Adapter"}; break; @@ -309,7 +310,7 @@ case PCI_DEVICE_ID_SAT: m = (typeof(m)){"LPe12000", "PCIe", "Fibre Channel Adapter"}; break; -@@ -2399,17 +2489,54 @@ +@@ -2505,17 +2595,54 @@ case PCI_DEVICE_ID_SAT_S: m = (typeof(m)){"LPe12000-S", "PCIe", "Fibre Channel Adapter"}; break; @@ -365,7 +366,7 @@ break; case PCI_DEVICE_ID_LANCER_G6_FC: m = (typeof(m)){"LPe32000", "PCIe", "Fibre Channel Adapter"}; -@@ -6232,6 +6359,13 @@ +@@ -7528,6 +7655,13 @@ if (rc) return -ENODEV; diff --git a/SPECS/kmod-lpfc.spec b/SPECS/kmod-lpfc.spec index 005ef9a..c047ddc 100644 --- a/SPECS/kmod-lpfc.spec +++ b/SPECS/kmod-lpfc.spec @@ -177,6 +177,7 @@ fi %changelog * Fri Jan 07 2022 Kmods SIG - 4.18.0.358-1 - Update to 4.18.0-358.el8 +- Update 0001-add-deprecated-ids.patch * Thu Oct 28 2021 Peter Georg - 4.18.0.348-1 - Update to 4.18.0-348.el8