46c46
< __FBSDID("$FreeBSD: head/sys/dev/isp/isp.c 166894 2007-02-23 05:39:58Z mjacob $");
---
> __FBSDID("$FreeBSD: head/sys/dev/isp/isp.c 166929 2007-02-23 21:59:21Z mjacob $");
1557a1558
> int ownloopid;
1632a1634
> ownloopid = (isp->isp_confopts & ISP_CFG_OWNLOOPID) != 0;
1634,1644c1636,1637
< /*
< * We end up with these Loop IDs for F-Port topologies
< */
< if (icbp->icb_hardaddr != 0xff &&
< icbp->icb_hardaddr != 0x800 &&
< icbp->icb_hardaddr != 0xffff) {
< isp_prt(isp, ISP_LOGERR,
< "bad hard address %u- resetting to zero",
< icbp->icb_hardaddr);
< icbp->icb_hardaddr = 0;
< }
---
> icbp->icb_hardaddr = 0;
> ownloopid = 0;
1651c1644
< if (ISP_FW_NEWER_THAN(isp, 2, 2, 5)) {
---
> if (ownloopid || ISP_FW_NEWER_THAN(isp, 2, 2, 5)) {
1802a1796
> isp_print_bytes(isp, "isp_fibre_init", sizeof (*icbp), icbp);
1820a1815
> int ownloopid;
1888a1884
> ownloopid = (isp->isp_confopts & ISP_CFG_OWNLOOPID) != 0;
1890,1900c1886,1887
< /*
< * We end up with these Loop IDs for F-Port topologies
< */
< if (icbp->icb_hardaddr != 0xff &&
< icbp->icb_hardaddr != 0x800 &&
< icbp->icb_hardaddr != 0xffff) {
< isp_prt(isp, ISP_LOGERR,
< "bad hard address %u- resetting to zero",
< icbp->icb_hardaddr);
< icbp->icb_hardaddr = 0;
< }
---
> icbp->icb_hardaddr = 0;
> ownloopid = 0;
1902,1903c1889
<
< if (isp->isp_confopts & ISP_CFG_OWNLOOPID) {
---
> if (ownloopid) {
2283d2268
< break;
2966c2951
< * which shift on a loop, or have a WWPN/WWNN but no portid.
---
> * which shift on a loop.
2969,2978c2954,2961
< if (isp->isp_dblev & ISP_LOGSANCFG) {
< int a, b, c;
< a = !(tmp.node_wwn == 0);
< b = !(tmp.port_wwn == 0);
< c = !(tmp.portid == 0);
< isp_prt(isp, ISP_LOGALL,
< "bad pdb (%1d%1d%1d) @ handle 0x%x",
< a, b, c, handle);
< isp_dump_portdb(isp);
< }
---
> int a, b, c;
> a = (tmp.node_wwn == 0);
> b = (tmp.port_wwn == 0);
> c = (tmp.portid == 0);
> isp_prt(isp, ISP_LOGWARN,
> "bad pdb (%1d%1d%1d) @ handle 0x%x", a, b, c,
> handle);
> isp_dump_portdb(isp);
4579d4561
< return;
7526c7508
< if ((tmp & (1 << 31)) != 0) {
---
> if ((tmp & (1U << 31)) != 0) {
7530c7512
< if (tmp & (1 << 31)) {
---
> if (tmp & (1U << 31)) {