From 107d7b2991de212452af41e52dce14778dda0823 Mon Sep 17 00:00:00 2001 From: Mike Christie Date: Mon, 30 Jun 2008 17:40:13 -0500 Subject: [PATCH 09/12] libfc: use get/put_aligned_be helpers Use get/put_alignged_be helpers. Signed-off-by: Mike Christie --- drivers/scsi/libfc/fc_disc.c | 2 +- drivers/scsi/libfc/fc_lport.c | 13 ++++++------- drivers/scsi/libfc/fc_rport.c | 13 +++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/scsi/libfc/fc_disc.c b/drivers/scsi/libfc/fc_disc.c index 95133f2..eade18b 100644 --- a/drivers/scsi/libfc/fc_disc.c +++ b/drivers/scsi/libfc/fc_disc.c @@ -1103,7 +1103,7 @@ static void fc_disc_enter_reg_pn(struct fc_lport *lp) memset(req, 0, sizeof(*req)); fc_lport_fill_dns_hdr(lp, &req->ct, FC_NS_RPN_ID, sizeof(req->rn)); req->rn.fr_fid.fp_fid = hton24(lp->fid); - put_unaligned(htonll(lp->wwpn), &req->rn.fr_wwn); + put_unaligned_be64(lp->wwpn, &req->rn.fr_wwn); fc_frame_setup(fp, FC_RCTL_DD_UNSOL_CTL, FC_TYPE_CT); dns_rp = lp->dns_rp->dd_data; if (!lp->tt.exch_seq_send(lp, fp, diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c index 96643b8..2ded38e 100644 --- a/drivers/scsi/libfc/fc_lport.c +++ b/drivers/scsi/libfc/fc_lport.c @@ -250,9 +250,8 @@ fc_lport_flogi_fill(struct fc_lport *lp, memset(flogi, 0, sizeof(*flogi)); flogi->fl_cmd = (u8) op; - put_unaligned(htonll(lp->wwpn), &flogi->fl_wwpn); - put_unaligned(htonll(lp->wwnn), &flogi->fl_wwnn); - + put_unaligned_be64(lp->wwpn, &flogi->fl_wwpn); + put_unaligned_be64(lp->wwnn, &flogi->fl_wwnn); sp = &flogi->fl_csp; sp->sp_hi_ver = 0x20; sp->sp_lo_ver = 0x20; @@ -318,8 +317,8 @@ fc_lport_flogi_resp(struct fc_seq *sp, lp->fl_r_a_tov = 2 * e_d_tov; FC_DBG("point-to-point mode"); fc_lport_ptp_setup(lp, ntoh24(fh->fh_s_id), - ntohll(get_unaligned(&flp->fl_wwpn)), - ntohll(get_unaligned(&flp->fl_wwnn))); + get_unaligned_be64(&flp->fl_wwpn), + get_unaligned_be64(&flp->fl_wwnn)); } else { lp->fl_e_d_tov = e_d_tov; lp->fl_r_a_tov = r_a_tov; @@ -392,7 +391,7 @@ static void fc_lport_recv_flogi_req(struct fc_seq *sp_in, flp = fc_frame_payload_get(rx_fp, sizeof(*flp)); if (!flp) goto out; - remote_wwpn = ntohll(get_unaligned(&flp->fl_wwpn)); + remote_wwpn = get_unaligned_be64(&flp->fl_wwpn); if (remote_wwpn == lp->wwpn) { FC_DBG("FLOGI from port with same WWPN %llx " "possible configuration error.", remote_wwpn); @@ -443,7 +442,7 @@ static void fc_lport_recv_flogi_req(struct fc_seq *sp_in, fc_lport_retry(lp); } fc_lport_ptp_setup(lp, remote_fid, remote_wwpn, - ntohll(get_unaligned(&flp->fl_wwnn))); + get_unaligned_be64(&flp->fl_wwnn)); fc_lport_unlock(lp); if (!lp->tt.disc_start(lp)) FC_DBG("target discovery start error\n"); diff --git a/drivers/scsi/libfc/fc_rport.c b/drivers/scsi/libfc/fc_rport.c index 0061fd1..678617b 100644 --- a/drivers/scsi/libfc/fc_rport.c +++ b/drivers/scsi/libfc/fc_rport.c @@ -287,8 +287,8 @@ fc_lport_plogi_fill(struct fc_lport *lp, memset(flogi, 0, sizeof(*flogi)); flogi->fl_cmd = (u8) op; - put_unaligned(htonll(lp->wwpn), &flogi->fl_wwpn); - put_unaligned(htonll(lp->wwnn), &flogi->fl_wwnn); + put_unaligned_be64(lp->wwpn, &flogi->fl_wwpn); + put_unaligned_be64(lp->wwnn, &flogi->fl_wwnn); sp = &flogi->fl_csp; sp->sp_hi_ver = 0x20; @@ -703,8 +703,9 @@ static void fc_rport_plogi_recv_resp(struct fc_seq *sp, struct fc_frame *fp, fc_sess_lock(rp); if (op == ELS_LS_ACC && (plp = fc_frame_payload_get(fp, sizeof(*plp))) != NULL) { - wwpn = ntohll(get_unaligned(&plp->fl_wwpn)); - wwnn = ntohll(get_unaligned(&plp->fl_wwnn)); + wwpn = get_unaligned_be64(&plp->fl_wwpn); + wwnn = get_unaligned_be64(&plp->fl_wwnn); + fc_rport_set_name(rp->rport, wwpn, wwnn); tov = ntohl(plp->fl_csp.sp_e_d_tov); if (ntohs(plp->fl_csp.sp_features) & FC_SP_FT_EDTR) @@ -1081,8 +1082,8 @@ static void fc_rport_recv_plogi_req(struct fc_remote_port *rp, fc_frame_free(fp); return; } - wwpn = ntohll(get_unaligned(&pl->fl_wwpn)); - wwnn = ntohll(get_unaligned(&pl->fl_wwnn)); + wwpn = get_unaligned_be64(&pl->fl_wwpn); + wwnn = get_unaligned_be64(&pl->fl_wwnn); fc_sess_lock(rp); lp = rp->local_port; -- 1.5.4.1