From: Peter Georg <peter.georg@xxxxxxxxxxxxxxxxxxxxxxxx> sfc: Add ifdef RHEL_DIFFERENCES Bugzilla: http://bugzilla.redhat.com/2019379 Upstream Status: RHEL only Fixes: 0c24f61383cf4 Signed-off-by: Peter Georg <peter.georg@xxxxxxxxxxxxxxxxxxxxxxxx> diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index blahblah..blahblah 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c @@ -818,11 +818,13 @@ static const struct pci_device_id efx_pci_table[] = { {0} /* end of list */ }; +#ifdef CONFIG_RHEL_DIFFERENCES static const struct pci_device_id efx_unmaintained_pci_table[] = { {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0803)}, /* SFC9020 */ {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0813)}, /* SFL9021 */ {0} }; +#endif /************************************************************************** * @@ -1078,7 +1080,9 @@ static int efx_pci_probe(struct pci_dev *pci_dev, if (!efx->type->is_vf) efx_probe_vpd_strings(efx); +#ifdef CONFIG_RHEL_DIFFERENCES pci_hw_unmaintained(efx_unmaintained_pci_table, pci_dev); +#endif /* Set up basic I/O (BAR mappings etc) */ rc = efx_init_io(efx, efx->type->mem_bar(efx), efx->type->max_dma_mask, -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1610 _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
