Page MenuHomeFreeBSD
Files F132340571

D23807.diff
No OneTemporary
Actions

D23807.diff
View Options

Index: head/sys/dev/rtwn/pci/rtwn_pci_attach.h
===================================================================
--- head/sys/dev/rtwn/pci/rtwn_pci_attach.h
+++ head/sys/dev/rtwn/pci/rtwn_pci_attach.h
@@ -36,7 +36,6 @@
{ 0x10ec, 0x8176, "Realtek RTL8188CE", RTWN_CHIP_RTL8192CE },
{ 0x10ec, 0x8179, "Realtek RTL8188EE", RTWN_CHIP_RTL8188EE },
{ 0x10ec, 0x8178, "Realtek RTL8192CE", RTWN_CHIP_RTL8192CE },
- { 0, 0, NULL, RTWN_CHIP_MAX_PCI }
};
typedef void (*chip_pci_attach)(struct rtwn_pci_softc *);
Index: head/sys/dev/rtwn/pci/rtwn_pci_attach.c
===================================================================
--- head/sys/dev/rtwn/pci/rtwn_pci_attach.c
+++ head/sys/dev/rtwn/pci/rtwn_pci_attach.c
@@ -96,15 +96,16 @@
static const struct rtwn_pci_ident *
rtwn_pci_probe_sub(device_t dev)
{
- const struct rtwn_pci_ident *ident;
- int vendor_id, device_id;
+ int i, vendor_id, device_id;
vendor_id = pci_get_vendor(dev);
device_id = pci_get_device(dev);
- for (ident = rtwn_pci_ident_table; ident->name != NULL; ident++)
- if (vendor_id == ident->vendor && device_id == ident->device)
- return (ident);
+ for (i = 0; i < nitems(rtwn_pci_ident_table); i++) {
+ if (vendor_id == rtwn_pci_ident_table[i].vendor &&
+ device_id == rtwn_pci_ident_table[i].device)
+ return (&rtwn_pci_ident_table[i]);
+ }
return (NULL);
}
@@ -788,6 +789,8 @@
DRIVER_MODULE(rtwn_pci, pci, rtwn_pci_driver, rtwn_pci_devclass, NULL, NULL);
MODULE_VERSION(rtwn_pci, 1);
+MODULE_PNP_INFO("U16:vendor;U16:device;D:#", pci, rtwn, rtwn_pci_ident_table,
+ nitems(rtwn_pci_ident_table));
MODULE_DEPEND(rtwn_pci, pci, 1, 1, 1);
MODULE_DEPEND(rtwn_pci, wlan, 1, 1, 1);
MODULE_DEPEND(rtwn_pci, rtwn, 2, 2, 2);

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 17, 1:35 AM (14 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23812324
Default Alt Text
D23807.diff (1 KB)

Event Timeline