summaryrefslogtreecommitdiff
path: root/include/scsi
diff options
context:
space:
mode:
authorBhanu Prakash Gollapudi <bprakash@broadcom.com>2011-02-25 15:03:07 -0800
committerJames Bottomley <James.Bottomley@suse.de>2011-02-28 18:32:33 -0600
commit059f04d4aa60f89b7ad6ca118856f4cb59d9257f (patch)
treee96e5e540062b1eceb290e8ddb2b6cda8b305261 /include/scsi
parent72fa396bf57b31e8e2a401a21a3a088c0cc6b043 (diff)
downloadlinux-3.10-059f04d4aa60f89b7ad6ca118856f4cb59d9257f.tar.gz
linux-3.10-059f04d4aa60f89b7ad6ca118856f4cb59d9257f.tar.bz2
linux-3.10-059f04d4aa60f89b7ad6ca118856f4cb59d9257f.zip
[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: Bhanu Prakash Gollapudi <bprakash@broadcom.com> Signed-off-by: Robert Love <robert.w.love@intel.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'include/scsi')
-rw-r--r--include/scsi/fc_encode.h26
1 files changed, 17 insertions, 9 deletions
diff --git a/include/scsi/fc_encode.h b/include/scsi/fc_encode.h
index 6d293c846a4..be418d8448a 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.