Merge if_em.c:1.82 from HEAD to RELENG_6:

Put probe-time printf of adapter speed and duplex behind bootverbose:
  since the link takes a bit to negotiate, the information is pretty
  much never available during the probe.  As such, the boot output
  pretty much always prints N/A for speed and duplex.  Since we print
  out the output of ifconfig during the user space boot, this early
  boot information is also generally redundant, and added to the noise.
This commit is contained in:
rwatson 2005-11-14 10:40:10 +00:00
parent 245bd5abe3
commit ef3f374f31

View File

@ -468,16 +468,20 @@ em_attach(device_t dev)
adapter->hw.get_link_status = 1;
em_check_for_link(&adapter->hw);
/* Print the link status */
if (adapter->link_active == 1) {
em_get_speed_and_duplex(&adapter->hw, &adapter->link_speed,
&adapter->link_duplex);
printf("em%d: Speed:%d Mbps Duplex:%s\n",
adapter->unit,
adapter->link_speed,
adapter->link_duplex == FULL_DUPLEX ? "Full" : "Half");
} else
printf("em%d: Speed:N/A Duplex:N/A\n", adapter->unit);
if (bootverbose) {
/* Print the link status */
if (adapter->link_active == 1) {
em_get_speed_and_duplex(&adapter->hw,
&adapter->link_speed, &adapter->link_duplex);
printf("em%d: Speed:%d Mbps Duplex:%s\n",
adapter->unit,
adapter->link_speed,
adapter->link_duplex == FULL_DUPLEX ? "Full" :
"Half");
} else
printf("em%d: Speed:N/A Duplex:N/A\n",
adapter->unit);
}
/* Identify 82544 on PCIX */
em_get_bus_info(&adapter->hw);