d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix an error which could cause a panic if both an ifpi and ifpi2 controller

Browse Source 
were installed.

For the ifpi2, change the string in the driver_t from "ifpi2" to
"ifpi2-" so that one sees "ifpi2-0" instead of "ifpi20" at boot time.
This commit is contained in:
gj 2001-12-29 17:19:25 +00:00
parent 1951cbf9ee
commit ef6370195b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
View File

@ -1291,8 +1291,8 @@ avma1pp_init_linktab(struct l1_softc *sc)
/* avoid overwriting if already set */
if (ctrl_types[CTRL_PASSIVE].set_linktab == NULL)
{
ctrl_types[CTRL_PASSIVE].set_linktab = avma1pp_set_linktab;
ctrl_types[CTRL_PASSIVE].get_linktab = avma1pp_ret_linktab;
ctrl_types[CTRL_PASSIVE].set_linktab = i4b_l1_set_linktab;
ctrl_types[CTRL_PASSIVE].get_linktab = i4b_l1_ret_linktab;
}
/* local setup */

6
sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
View File

@ -116,7 +116,7 @@ static device_method_t avma1pp2_pci_methods[] = {
};
static driver_t avma1pp2_pci_driver = {
"ifpi2",
"ifpi2-",
avma1pp2_pci_methods,
sizeof(struct l1_softc)
};
@ -1224,8 +1224,8 @@ avma1pp2_init_linktab(struct l1_softc *sc)
/* avoid overwriting if already set */
if (ctrl_types[CTRL_PASSIVE].set_linktab == NULL)
{
ctrl_types[CTRL_PASSIVE].set_linktab = avma1pp2_set_linktab;
ctrl_types[CTRL_PASSIVE].get_linktab = avma1pp2_ret_linktab;
ctrl_types[CTRL_PASSIVE].set_linktab = i4b_l1_set_linktab;
ctrl_types[CTRL_PASSIVE].get_linktab = i4b_l1_ret_linktab;
}
/* local setup */