On Thu, 2011-02-03 at 18:47 -0800, Bhanu Gollapudi wrote:
> fc_fill_fc_hdr() expects fc_frame as an argument. Introduce __fc_fill_fc_hdr to
> accept fc_frame_header as an argument.
Not sure you noticed this, Robert, but I need it to get the bnx2fc
driver compiling ... could you ack or send as part of the libfc updates?
Thanks,
James
> Signed-off-by: Bhanu Prakash Gollapudi <bprakash@xxxxxxxxxxxx>
> ---
> include/scsi/fc_encode.h | 26 +++++++++++++++++---------
> 1 files changed, 17 insertions(+), 9 deletions(-)
>
> diff --git a/include/scsi/fc_encode.h b/include/scsi/fc_encode.h
> index 6d293c8..be418d8 100644
> --- a/include/scsi/fc_encode.h
> +++ b/include/scsi/fc_encode.h
> @@ -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,
> - u32 did, u32 sid, enum fc_fh_type type,
> - u32 f_ctl, u32 parm_offset)
> +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);
> @@ -68,6 +63,19 @@ static inline void fc_fill_fc_hdr(struct fc_frame *fp, enum fc_rctl r_ctl,
> }
>
> /**
> + * 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.
> * @fp: fc frame where payload will be placed.
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
