diff options
author | Chris Leech <christopher.leech@intel.com> | 2009-11-03 14:46:56 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2009-12-04 13:01:02 -0500 |
commit | 5baa17c3e66fc2e414f501b2dd59b962dfc64919 (patch) | |
tree | 8194fcceb647f6740bdf6350da2a2d9dc393ae3e /include | |
parent | c9c7bd7a5e7321aa96289c9b48fdbcc828c105e6 (diff) |
[SCSI] libfc: Register Symbolic Node Name (RSNN_NN)
Register the fc_host symbolic name as the symbolic node 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 | 10 | ||||
-rw-r--r-- | include/scsi/libfc.h | 1 |
3 files changed, 21 insertions, 0 deletions
diff --git a/include/scsi/fc/fc_ns.h b/include/scsi/fc/fc_ns.h index 790d7b97d4bc..fa8283056325 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_RSNN_NN = 0x0239, /* reg symbolic node name */ | ||
50 | }; | 51 | }; |
51 | 52 | ||
52 | /* | 53 | /* |
@@ -156,4 +157,13 @@ struct fc_ns_rn_id { | |||
156 | __be64 fr_wwn; /* node name or port name */ | 157 | __be64 fr_wwn; /* node name or port name */ |
157 | } __attribute__((__packed__)); | 158 | } __attribute__((__packed__)); |
158 | 159 | ||
160 | /* | ||
161 | * RSNN_NN request - register symbolic node name | ||
162 | */ | ||
163 | struct fc_ns_rsnn { | ||
164 | __be64 fr_wwn; /* node name */ | ||
165 | __u8 fr_name_len; | ||
166 | char fr_name[]; | ||
167 | } __attribute__((__packed__)); | ||
168 | |||
159 | #endif /* _FC_NS_H_ */ | 169 | #endif /* _FC_NS_H_ */ |
diff --git a/include/scsi/fc_encode.h b/include/scsi/fc_encode.h index ad13cb1c3eec..89981afba72d 100644 --- a/include/scsi/fc_encode.h +++ b/include/scsi/fc_encode.h | |||
@@ -33,6 +33,7 @@ struct fc_ct_req { | |||
33 | struct fc_ns_rn_id rn; | 33 | struct fc_ns_rn_id rn; |
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 | } payload; | 37 | } payload; |
37 | }; | 38 | }; |
38 | 39 | ||
@@ -136,6 +137,15 @@ static inline int fc_ct_fill(struct fc_lport *lport, | |||
136 | put_unaligned_be64(lport->wwnn, &ct->payload.rn.fr_wwn); | 137 | put_unaligned_be64(lport->wwnn, &ct->payload.rn.fr_wwn); |
137 | break; | 138 | break; |
138 | 139 | ||
140 | case FC_NS_RSNN_NN: | ||
141 | ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rsnn)); | ||
142 | put_unaligned_be64(lport->wwnn, &ct->payload.snn.fr_wwn); | ||
143 | strncpy(ct->payload.snn.fr_name, | ||
144 | fc_host_symbolic_name(lport->host), 255); | ||
145 | ct->payload.snn.fr_name_len = | ||
146 | strnlen(ct->payload.snn.fr_name, 255); | ||
147 | break; | ||
148 | |||
139 | default: | 149 | default: |
140 | return -EINVAL; | 150 | return -EINVAL; |
141 | } | 151 | } |
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h index 3d22dfd67209..1a632069c402 100644 --- a/include/scsi/libfc.h +++ b/include/scsi/libfc.h | |||
@@ -62,6 +62,7 @@ enum fc_lport_state { | |||
62 | LPORT_ST_FLOGI, | 62 | LPORT_ST_FLOGI, |
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_RFT_ID, | 66 | LPORT_ST_RFT_ID, |
66 | LPORT_ST_SCR, | 67 | LPORT_ST_SCR, |
67 | LPORT_ST_READY, | 68 | LPORT_ST_READY, |