summaryrefslogtreecommitdiffstats
path: root/src/usr/fcmgmt.c
diff options
context:
space:
mode:
authorMichael Brown2010-10-15 02:06:08 +0200
committerMichael Brown2010-10-15 02:54:48 +0200
commit60b690141eaa8c736ab06500e6adfc9413c9b7f7 (patch)
treec17abac475867c7b34360f8c4786b059d9c3c63f /src/usr/fcmgmt.c
parent[fcoe] Request SPMA iff FIP advertisement indicates support for SPMA (diff)
downloadipxe-60b690141eaa8c736ab06500e6adfc9413c9b7f7.tar.gz
ipxe-60b690141eaa8c736ab06500e6adfc9413c9b7f7.tar.xz
ipxe-60b690141eaa8c736ab06500e6adfc9413c9b7f7.zip
[fc] Use port WWN rather than node WWN as the primary Fibre Channel name
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/usr/fcmgmt.c')
-rw-r--r--src/usr/fcmgmt.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/usr/fcmgmt.c b/src/usr/fcmgmt.c
index 5a4d8117..1af723d1 100644
--- a/src/usr/fcmgmt.c
+++ b/src/usr/fcmgmt.c
@@ -38,19 +38,18 @@ FILE_LICENCE ( GPL2_OR_LATER );
* @v port Fibre Channel port
*/
void fcportstat ( struct fc_port *port ) {
- printf ( "%s: %s", port->name, fc_ntoa ( &port->node_wwn ) );
- printf ( " port %s id %s\n [Link:", fc_ntoa ( &port->port_wwn ),
+ printf ( "%s: %s id %s", port->name, fc_ntoa ( &port->port_wwn ),
fc_id_ntoa ( &port->port_id ) );
+ printf ( " node %s\n [Link:", fc_ntoa ( &port->node_wwn ) );
if ( fc_link_ok ( &port->link ) ) {
- printf ( " up, %s", fc_ntoa ( &port->link_node_wwn ) );
- printf ( " port %s", fc_ntoa ( &port->link_port_wwn ) );
+ printf ( " up, %s", fc_ntoa ( &port->link_port_wwn ) );
if ( ( port->flags & FC_PORT_HAS_FABRIC ) ) {
printf ( " fabric" );
} else {
printf ( " id %s",
fc_id_ntoa ( &port->ptp_link_port_id ) );
}
- printf ( "]\n" );
+ printf ( " node %s]\n", fc_ntoa ( &port->link_node_wwn ) );
} else {
printf ( " down: %s]\n", strerror ( port->link.rc ) );
}
@@ -66,7 +65,7 @@ void fcpeerstat ( struct fc_peer *peer ) {
uint8_t *param;
unsigned int i;
- printf ( "%s:\n [Link:", fc_ntoa ( &peer->node_wwn ) );
+ printf ( "%s:\n [Link:", fc_ntoa ( &peer->port_wwn ) );
if ( fc_link_ok ( &peer->link ) ) {
printf ( " up, port %s id %s]\n", peer->port->name,
fc_id_ntoa ( &peer->port_id ) );