iwlwifi: adjust the LinuxKPI pci return for now

Rather than having LinuxKPI return BUS_PROBE_DEFAULT, return
"one less" so that on conflict of IDs others would be preferred.

This means that iwm(4) will attach instead of iwlwifi(4) for the
chipsets iwm(4) supports and iwlwifi(4) only for the other--in iwm(4)
unsupported--chipsets.  This is done so that we can enable auto-loading
of drivers but for the upcoming 13.1-Release people with working iwm(4)
will not yet be affected by iwlwifi(4).

Sponsored by:	The FreeBSD Foundation
MFC after:	3 days
This commit is contained in:
Bjoern A. Zeeb 2022-03-03 22:24:13 +00:00
parent b91dd79ba3
commit 3d248a914d

View File

@ -1746,6 +1746,10 @@ static struct pci_driver iwl_pci_driver = {
.probe = iwl_pci_probe,
.remove = iwl_pci_remove,
.driver.pm = IWL_PM_OPS,
#if defined(__FreeBSD__)
/* Allow iwm(4) to attach for conflicting IDs for now. */
.bsd_probe_return = (BUS_PROBE_DEFAULT - 1),
#endif
};
int __must_check iwl_pci_register_driver(void)