diff options
author | Chris Leech <christopher.leech@intel.com> | 2009-11-03 14:47:01 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2009-12-04 13:01:02 -0500 |
commit | c9866a548024c33e30f35a14bbcb71ba78266383 (patch) | |
tree | 99c68b4f8292ccffd39645424cdd0965a867e161 /include | |
parent | 5baa17c3e66fc2e414f501b2dd59b962dfc64919 (diff) |
[SCSI] libfc: Register Symbolic Port Name (RSPN_ID)
Register the fc_host symbolic name as the symbolic port name
with the fabric name server.
Signed-off-by: Chris Leech <christopher.leech@intel.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/scsi/fc/fc_ns.h | 10 | ||||
-rw-r--r-- | include/scsi/fc_encode.h | 11 | ||||
-rw-r--r-- | include/scsi/libfc.h | 1 |
3 files changed, 22 insertions, 0 deletions
diff --git a/include/scsi/fc/fc_ns.h b/include/scsi/fc/fc_ns.h index fa8283056325..3fd59a2cb81f 100644 --- a/include/scsi/fc/fc_ns.h +++ b/include/scsi/fc/fc_ns.h | |||
@@ -47,6 +47,7 @@ enum fc_ns_req { | |||
47 | FC_NS_RFT_ID = 0x0217, /* reg FC4 type for ID */ | 47 | FC_NS_RFT_ID = 0x0217, /* reg FC4 type for ID */ |
48 | FC_NS_RPN_ID = 0x0212, /* reg port name for ID */ | 48 | FC_NS_RPN_ID = 0x0212, /* reg port name for ID */ |
49 | FC_NS_RNN_ID = 0x0213, /* reg node name for ID */ | 49 | FC_NS_RNN_ID = 0x0213, /* reg node name for ID */ |
50 | FC_NS_RSPN_ID = 0x0218, /* reg symbolic port name */ | ||
50 | FC_NS_RSNN_NN = 0x0239, /* reg symbolic node name */ | 51 | FC_NS_RSNN_NN = 0x0239, /* reg symbolic node name */ |
51 | }; | 52 | }; |
52 | 53 | ||
@@ -166,4 +167,13 @@ struct fc_ns_rsnn { | |||
166 | char fr_name[]; | 167 | char fr_name[]; |
167 | } __attribute__((__packed__)); | 168 | } __attribute__((__packed__)); |
168 | 169 | ||
170 | /* | ||
171 | * RSPN_ID request - register symbolic port name | ||
172 | */ | ||
173 | struct fc_ns_rspn { | ||
174 | struct fc_ns_fid fr_fid; /* port ID object */ | ||
175 | __u8 fr_name_len; | ||
176 | char fr_name[]; | ||
177 | } __attribute__((__packed__)); | ||
178 | |||
169 | #endif /* _FC_NS_H_ */ | 179 | #endif /* _FC_NS_H_ */ |
diff --git a/include/scsi/fc_encode.h b/include/scsi/fc_encode.h index 89981afba72d..9afcbb94ec30 100644 --- a/include/scsi/fc_encode.h +++ b/include/scsi/fc_encode.h | |||
@@ -34,6 +34,7 @@ struct fc_ct_req { | |||
34 | struct fc_ns_rft rft; | 34 | struct fc_ns_rft rft; |
35 | struct fc_ns_fid fid; | 35 | struct fc_ns_fid fid; |
36 | struct fc_ns_rsnn snn; | 36 | struct fc_ns_rsnn snn; |
37 | struct fc_ns_rspn spn; | ||
37 | } payload; | 38 | } payload; |
38 | }; | 39 | }; |
39 | 40 | ||
@@ -137,6 +138,16 @@ static inline int fc_ct_fill(struct fc_lport *lport, | |||
137 | put_unaligned_be64(lport->wwnn, &ct->payload.rn.fr_wwn); | 138 | put_unaligned_be64(lport->wwnn, &ct->payload.rn.fr_wwn); |
138 | break; | 139 | break; |
139 | 140 | ||
141 | case FC_NS_RSPN_ID: | ||
142 | ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rspn)); | ||
143 | hton24(ct->payload.spn.fr_fid.fp_fid, | ||
144 | fc_host_port_id(lport->host)); | ||
145 | strncpy(ct->payload.spn.fr_name, | ||
146 | fc_host_symbolic_name(lport->host), 255); | ||
147 | ct->payload.spn.fr_name_len = | ||
148 | strnlen(ct->payload.spn.fr_name, 255); | ||
149 | break; | ||
150 | |||
140 | case FC_NS_RSNN_NN: | 151 | case FC_NS_RSNN_NN: |
141 | ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rsnn)); | 152 | ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rsnn)); |
142 | put_unaligned_be64(lport->wwnn, &ct->payload.snn.fr_wwn); | 153 | put_unaligned_be64(lport->wwnn, &ct->payload.snn.fr_wwn); |
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h index 1a632069c402..8258edfa328c 100644 --- a/include/scsi/libfc.h +++ b/include/scsi/libfc.h | |||
@@ -63,6 +63,7 @@ enum fc_lport_state { | |||
63 | LPORT_ST_DNS, | 63 | LPORT_ST_DNS, |
64 | LPORT_ST_RNN_ID, | 64 | LPORT_ST_RNN_ID, |
65 | LPORT_ST_RSNN_NN, | 65 | LPORT_ST_RSNN_NN, |
66 | LPORT_ST_RSPN_ID, | ||
66 | LPORT_ST_RFT_ID, | 67 | LPORT_ST_RFT_ID, |
67 | LPORT_ST_SCR, | 68 | LPORT_ST_SCR, |
68 | LPORT_ST_READY, | 69 | LPORT_ST_READY, |