diff options
| author | mjacob <mjacob@FreeBSD.org> | 2006-08-21 00:46:10 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 2006-08-21 00:46:10 +0000 |
| commit | 40cc07237da3a7fa360475e37f6f9de5610acf82 (patch) | |
| tree | ad792ef6fcbcac3f44fdb8edbdff8de3a91843fe /sys/dev/isp | |
| parent | ce3ad477002b94fa5e1ffb9f7f02f6c63b840526 (diff) | |
| download | FreeBSD-src-40cc07237da3a7fa360475e37f6f9de5610acf82.zip FreeBSD-src-40cc07237da3a7fa360475e37f6f9de5610acf82.tar.gz | |
Fix RELENG_4 code version- isp_roles wasn't getting initialized so
it ended up defaulting to ISP_ROLE_NONE. My testing hadn't caught it
because I was deliberatly setting role via ioctl.
Thanks to user Toni for lending me an alpha to test this on.
MFC after: 0 days
Diffstat (limited to 'sys/dev/isp')
| -rw-r--r-- | sys/dev/isp/isp_ioctl.h | 3 | ||||
| -rw-r--r-- | sys/dev/isp/isp_pci.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/isp/isp_ioctl.h b/sys/dev/isp/isp_ioctl.h index 75ca406..4171466 100644 --- a/sys/dev/isp/isp_ioctl.h +++ b/sys/dev/isp/isp_ioctl.h @@ -61,9 +61,6 @@ #define ISP_ROLE_TARGET 0x1 #define ISP_ROLE_INITIATOR 0x2 #define ISP_ROLE_BOTH (ISP_ROLE_TARGET|ISP_ROLE_INITIATOR) -#ifndef ISP_DEFAULT_ROLES -#define ISP_DEFAULT_ROLES ISP_ROLE_BOTH -#endif /* * Get the current adapter role diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c index 52dab04..2132b4e 100644 --- a/sys/dev/isp/isp_pci.c +++ b/sys/dev/isp/isp_pci.c @@ -509,6 +509,12 @@ isp_get_options(device_t dev, ispsoftc_t *isp) } } #endif + bitmap = 0; + if (getenv_int("role", &bitmap)) { + isp->isp_role = bitmap; + } else { + isp->isp_role = ISP_DEFAULT_ROLES; + } } static void |
