From ee50cfe1f154491adfc045dd9247d85e461b1df7 Mon Sep 17 00:00:00 2001 From: David Christensen Date: Tue, 15 Mar 2011 01:06:27 +0000 Subject: [PATCH] - Inadvertently committed files with +x attribute, fixed. - Minor change to info output string. --- sys/dev/bxe/bxe_debug.h | 0 sys/dev/bxe/bxe_fw_defs.h | 0 sys/dev/bxe/bxe_hsi.h | 0 sys/dev/bxe/bxe_include.h | 0 sys/dev/bxe/bxe_init.h | 0 sys/dev/bxe/bxe_init_values_e1.h | 0 sys/dev/bxe/bxe_init_values_e1h.h | 0 sys/dev/bxe/bxe_link.c | 0 sys/dev/bxe/bxe_link.h | 0 sys/dev/bxe/bxe_reg.h | 0 sys/dev/bxe/bxe_self_test.h | 0 sys/dev/bxe/dump_e1.h | 0 sys/dev/bxe/dump_e1h.h | 0 sys/dev/bxe/hw_dump_reg_st.h | 0 sys/dev/bxe/if_bxe.c | 29 ++++++++++++++++++++--------- sys/dev/bxe/if_bxe.h | 0 sys/modules/bxe/Makefile | 0 17 files changed, 20 insertions(+), 9 deletions(-) mode change 100755 => 100644 sys/dev/bxe/bxe_debug.h mode change 100755 => 100644 sys/dev/bxe/bxe_fw_defs.h mode change 100755 => 100644 sys/dev/bxe/bxe_hsi.h mode change 100755 => 100644 sys/dev/bxe/bxe_include.h mode change 100755 => 100644 sys/dev/bxe/bxe_init.h mode change 100755 => 100644 sys/dev/bxe/bxe_init_values_e1.h mode change 100755 => 100644 sys/dev/bxe/bxe_init_values_e1h.h mode change 100755 => 100644 sys/dev/bxe/bxe_link.c mode change 100755 => 100644 sys/dev/bxe/bxe_link.h mode change 100755 => 100644 sys/dev/bxe/bxe_reg.h mode change 100755 => 100644 sys/dev/bxe/bxe_self_test.h mode change 100755 => 100644 sys/dev/bxe/dump_e1.h mode change 100755 => 100644 sys/dev/bxe/dump_e1h.h mode change 100755 => 100644 sys/dev/bxe/hw_dump_reg_st.h mode change 100755 => 100644 sys/dev/bxe/if_bxe.c mode change 100755 => 100644 sys/dev/bxe/if_bxe.h mode change 100755 => 100644 sys/modules/bxe/Makefile diff --git a/sys/dev/bxe/bxe_debug.h b/sys/dev/bxe/bxe_debug.h old mode 100755 new mode 100644 diff --git a/sys/dev/bxe/bxe_fw_defs.h b/sys/dev/bxe/bxe_fw_defs.h old mode 100755 new mode 100644 diff --git a/sys/dev/bxe/bxe_hsi.h b/sys/dev/bxe/bxe_hsi.h old mode 100755 new mode 100644 diff --git a/sys/dev/bxe/bxe_include.h b/sys/dev/bxe/bxe_include.h old mode 100755 new mode 100644 diff --git a/sys/dev/bxe/bxe_init.h b/sys/dev/bxe/bxe_init.h old mode 100755 new mode 100644 diff --git a/sys/dev/bxe/bxe_init_values_e1.h b/sys/dev/bxe/bxe_init_values_e1.h old mode 100755 new mode 100644 diff --git a/sys/dev/bxe/bxe_init_values_e1h.h b/sys/dev/bxe/bxe_init_values_e1h.h old mode 100755 new mode 100644 diff --git a/sys/dev/bxe/bxe_link.c b/sys/dev/bxe/bxe_link.c old mode 100755 new mode 100644 diff --git a/sys/dev/bxe/bxe_link.h b/sys/dev/bxe/bxe_link.h old mode 100755 new mode 100644 diff --git a/sys/dev/bxe/bxe_reg.h b/sys/dev/bxe/bxe_reg.h old mode 100755 new mode 100644 diff --git a/sys/dev/bxe/bxe_self_test.h b/sys/dev/bxe/bxe_self_test.h old mode 100755 new mode 100644 diff --git a/sys/dev/bxe/dump_e1.h b/sys/dev/bxe/dump_e1.h old mode 100755 new mode 100644 diff --git a/sys/dev/bxe/dump_e1h.h b/sys/dev/bxe/dump_e1h.h old mode 100755 new mode 100644 diff --git a/sys/dev/bxe/hw_dump_reg_st.h b/sys/dev/bxe/hw_dump_reg_st.h old mode 100755 new mode 100644 diff --git a/sys/dev/bxe/if_bxe.c b/sys/dev/bxe/if_bxe.c old mode 100755 new mode 100644 index 48f158e56d3b..2d81933096aa --- a/sys/dev/bxe/if_bxe.c +++ b/sys/dev/bxe/if_bxe.c @@ -986,6 +986,7 @@ bxe_probe(device_t dev) static void bxe_print_adapter_info(struct bxe_softc *sc) { + int i = 0; DBENTER(BXE_EXTREME_LOAD); @@ -1008,17 +1009,26 @@ bxe_print_adapter_info(struct bxe_softc *sc) } /* Device features. */ - printf("); Flags ( "); + printf("); Flags ("); /* Miscellaneous flags. */ if (sc->bxe_flags & BXE_USING_MSI_FLAG) - printf("MSI "); - if (sc->bxe_flags & BXE_USING_MSIX_FLAG) - printf("MSI-X "); - if (sc->bxe_flags & BXE_SAFC_TX_FLAG) - printf("SAFC "); - if (TPA_ENABLED(sc)) - printf("TPA "); + printf("MSI"); + + if (sc->bxe_flags & BXE_USING_MSIX_FLAG) { + if (i > 0) printf("|"); + printf("MSI-X"); i++; + } + + if (sc->bxe_flags & BXE_SAFC_TX_FLAG) { + if (i > 0) printf("|"); + printf("SAFC"); i++; + } + + if (TPA_ENABLED(sc)) { + if (i > 0) printf("|"); + printf("TPA"); i++; + } printf(") Queues ("); switch (sc->multi_mode) { @@ -1032,8 +1042,9 @@ bxe_print_adapter_info(struct bxe_softc *sc) printf("Unknown"); break; } + /* Firmware versions and device features. */ - BXE_PRINTF("Firmware (%d.%d.%d); Bootcode (%d.%d.%d)\n", + printf("); Firmware (%d.%d.%d); Bootcode (%d.%d.%d)\n", BCM_5710_FW_MAJOR_VERSION, BCM_5710_FW_MINOR_VERSION, BCM_5710_FW_REVISION_VERSION, diff --git a/sys/dev/bxe/if_bxe.h b/sys/dev/bxe/if_bxe.h old mode 100755 new mode 100644 diff --git a/sys/modules/bxe/Makefile b/sys/modules/bxe/Makefile old mode 100755 new mode 100644