From 12c6c642f8ce177f1c6e3f2bb8f17099bb1cdde7 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Sun, 11 Jan 2009 17:38:12 +0900 Subject: [PATCH] --- yaml --- r: 136220 b: refs/heads/master c: 6e7490c73d8cc48e7084ac976c8be7bbaf530acf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libfc/fc_lport.c | 5 +++-- trunk/drivers/scsi/libfc/fc_rport.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 055081d431ee..dab12567b2ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d943aeebc5194f3c6a81fb139ba406040324e4f3 +refs/heads/master: 6e7490c73d8cc48e7084ac976c8be7bbaf530acf diff --git a/trunk/drivers/scsi/libfc/fc_lport.c b/trunk/drivers/scsi/libfc/fc_lport.c index 2ae50a1188e6..7ef44501ecc6 100644 --- a/trunk/drivers/scsi/libfc/fc_lport.c +++ b/trunk/drivers/scsi/libfc/fc_lport.c @@ -762,10 +762,11 @@ static void fc_lport_recv_flogi_req(struct fc_seq *sp_in, remote_wwpn = get_unaligned_be64(&flp->fl_wwpn); if (remote_wwpn == lport->wwpn) { FC_DBG("FLOGI from port with same WWPN %llx " - "possible configuration error\n", remote_wwpn); + "possible configuration error\n", + (unsigned long long)remote_wwpn); goto out; } - FC_DBG("FLOGI from port WWPN %llx\n", remote_wwpn); + FC_DBG("FLOGI from port WWPN %llx\n", (unsigned long long)remote_wwpn); /* * XXX what is the right thing to do for FIDs? diff --git a/trunk/drivers/scsi/libfc/fc_rport.c b/trunk/drivers/scsi/libfc/fc_rport.c index dae65133a833..0472bb73221e 100644 --- a/trunk/drivers/scsi/libfc/fc_rport.c +++ b/trunk/drivers/scsi/libfc/fc_rport.c @@ -988,7 +988,7 @@ static void fc_rport_recv_plogi_req(struct fc_rport *rport, switch (rdata->rp_state) { case RPORT_ST_INIT: FC_DEBUG_RPORT("incoming PLOGI from %6x wwpn %llx state INIT " - "- reject\n", sid, wwpn); + "- reject\n", sid, (unsigned long long)wwpn); reject = ELS_RJT_UNSUP; break; case RPORT_ST_PLOGI: