Author: np
Date: Sun Dec 6 01:59:06 2009
New Revision: 200176
URL: http://svn.freebsd.org/changeset/base/200176
Log:
MFC r199237:
sc->rev and is_offload(sc) will always be 0 during probe. Wait till
attach to get correct values.
(missed this one in r200175)
Modified:
stable/8/sys/dev/cxgb/cxgb_main.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/dev/cxgb/cxgb_main.c
==============================================================================
--- stable/8/sys/dev/cxgb/cxgb_main.c Sun Dec 6 01:45:55 2009
(r200175)
+++ stable/8/sys/dev/cxgb/cxgb_main.c Sun Dec 6 01:59:06 2009
(r200176)
@@ -355,7 +355,6 @@ cxgb_controller_probe(device_t dev)
const struct adapter_info *ai;
char *ports, buf[80];
int nports;
- struct adapter *sc = device_get_softc(dev);
ai = cxgb_get_adapter_info(dev);
if (ai == NULL)
@@ -367,9 +366,7 @@ cxgb_controller_probe(device_t dev)
else
ports = "ports";
- snprintf(buf, sizeof(buf), "%s %sNIC, rev: %d nports: %d %s",
- ai->desc, is_offload(sc) ? "R" : "",
- sc->params.rev, nports, ports);
+ snprintf(buf, sizeof(buf), "%s, %d %s", ai->desc, nports, ports);
device_set_desc_copy(dev, buf);
return (BUS_PROBE_DEFAULT);
}
@@ -665,8 +662,8 @@ cxgb_controller_attach(device_t dev)
G_FW_VERSION_MAJOR(vers), G_FW_VERSION_MINOR(vers),
G_FW_VERSION_MICRO(vers));
- snprintf(buf, sizeof(buf), "%s\t E/C: %s S/N: %s",
- ai->desc,
+ snprintf(buf, sizeof(buf), "%s %sNIC\t E/C: %s S/N: %s",
+ ai->desc, is_offload(sc) ? "R" : "",
sc->params.vpd.ec, sc->params.vpd.sn);
device_set_desc_copy(dev, buf);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
