Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 059f04d4 authored by Bhanu Prakash Gollapudi's avatar Bhanu Prakash Gollapudi Committed by James Bottomley
Browse files

[SCSI] libfc: introduce __fc_fill_fc_hdr that accepts fc_hdr as an argument 



fc_fill_fc_hdr() expects fc_frame as an argument. Introduce __fc_fill_fc_hdr to
accept fc_frame_header as an argument.

Signed-off-by: default avatarBhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 72fa396b

include/scsi/fc_encode.h

+17 −9
Original line number Diff line number Diff line
@@ -46,16 +46,11 @@ struct fc_ct_req { 
	} payload;

};



/**

 * fill FC header fields in specified fc_frame

 */

static inline void fc_fill_fc_hdr(struct fc_frame *fp, enum fc_rctl r_ctl,

static inline void __fc_fill_fc_hdr(struct fc_frame_header *fh,

				    enum fc_rctl r_ctl,

				    u32 did, u32 sid, enum fc_fh_type type,

				    u32 f_ctl, u32 parm_offset)

{

	struct fc_frame_header *fh;



	fh = fc_frame_header_get(fp);

	WARN_ON(r_ctl == 0);

	fh->fh_r_ctl = r_ctl;

	hton24(fh->fh_d_id, did);
@@ -67,6 +62,19 @@ static inline void fc_fill_fc_hdr(struct fc_frame *fp, enum fc_rctl r_ctl, 
	fh->fh_parm_offset = htonl(parm_offset);

}



/**

 * fill FC header fields in specified fc_frame

 */

static inline void fc_fill_fc_hdr(struct fc_frame *fp, enum fc_rctl r_ctl,

				  u32 did, u32 sid, enum fc_fh_type type,

				  u32 f_ctl, u32 parm_offset)

{

	struct fc_frame_header *fh;



	fh = fc_frame_header_get(fp);

	__fc_fill_fc_hdr(fh, r_ctl, did, sid, type, f_ctl, parm_offset);

}



/**

 * fc_adisc_fill() - Fill in adisc request frame

 * @lport: local port.