diff options
author | Gary Jennejohn <gj@FreeBSD.org> | 2001-12-29 17:19:25 +0000 |
---|---|---|
committer | Gary Jennejohn <gj@FreeBSD.org> | 2001-12-29 17:19:25 +0000 |
commit | 01ecab40555760bd926baafa2013daabf1537338 (patch) | |
tree | b9fb05ad8198a687bf9a5af8803a66479d18ca7d /sys/i4b/layer1 | |
parent | b84c8f34fdac55981255cfd7496fc1fbbfda01f8 (diff) | |
download | src-01ecab40555760bd926baafa2013daabf1537338.tar.gz src-01ecab40555760bd926baafa2013daabf1537338.zip |
Fix an error which could cause a panic if both an ifpi and ifpi2 controller
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.
Notes
Notes:
svn path=/head/; revision=88675
Diffstat (limited to 'sys/i4b/layer1')
-rw-r--r-- | sys/i4b/layer1/ifpi/i4b_ifpi_pci.c | 4 | ||||
-rw-r--r-- | sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c index d14deb4c0c0f..9244bda95783 100644 --- a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c +++ b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c @@ -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 */ diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c index bbad26f091b6..6ce760e5b771 100644 --- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c +++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c @@ -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 */ |