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

Fix RELENG_4 code version- isp_roles wasn't getting initialized so

Browse Source 
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
This commit is contained in:
Matt Jacob 2006-08-21 00:46:10 +00:00
parent 4f9d17d8ab
commit 2298c14c62
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/dev/isp/isp_ioctl.h
View File

@ -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

6
sys/dev/isp/isp_pci.c
View File

@ -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