diff options
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/fc.c | 5 | ||||
| -rw-r--r-- | src/net/fcels.c | 27 |
2 files changed, 27 insertions, 5 deletions
diff --git a/src/net/fc.c b/src/net/fc.c index 63df3dada..33e13bdaf 100644 --- a/src/net/fc.c +++ b/src/net/fc.c @@ -428,6 +428,7 @@ static struct io_buffer * fc_xchg_alloc_iob ( struct fc_exchange *xchg, static int fc_xchg_tx ( struct fc_exchange *xchg, struct io_buffer *iobuf, struct xfer_metadata *meta ) { struct fc_port *port = xchg->port; + struct sockaddr_fc *dest = ( ( struct sockaddr_fc * ) meta->dest ); struct fc_frame_header *fchdr; unsigned int r_ctl; unsigned int f_ctl_es; @@ -484,7 +485,9 @@ static int fc_xchg_tx ( struct fc_exchange *xchg, struct io_buffer *iobuf, fchdr = iob_push ( iobuf, sizeof ( *fchdr ) ); memset ( fchdr, 0, sizeof ( *fchdr ) ); fchdr->r_ctl = r_ctl; - memcpy ( &fchdr->d_id, &xchg->peer_port_id, sizeof ( fchdr->d_id ) ); + memcpy ( &fchdr->d_id, + ( dest ? &dest->sfc_port_id : &xchg->peer_port_id ), + sizeof ( fchdr->d_id ) ); memcpy ( &fchdr->s_id, &port->port_id, sizeof ( fchdr->s_id ) ); fchdr->type = xchg->type; fchdr->f_ctl_es = f_ctl_es; diff --git a/src/net/fcels.c b/src/net/fcels.c index 63063ca35..fe2f5c224 100644 --- a/src/net/fcels.c +++ b/src/net/fcels.c @@ -119,15 +119,26 @@ static struct fc_els_handler * fc_els_detect ( struct fc_els *els, * @ret rc Return status code */ int fc_els_tx ( struct fc_els *els, const void *data, size_t len ) { - struct xfer_metadata meta = { - .flags = ( fc_els_is_request ( els ) ? - XFER_FL_OVER : ( XFER_FL_RESPONSE | XFER_FL_OUT ) ), - }; + union { + struct sockaddr sa; + struct sockaddr_fc fc; + } dest; + struct xfer_metadata meta; int rc; DBGC2 ( els, FCELS_FMT " transmitting:\n", FCELS_ARGS ( els ) ); DBGC2_HDA ( els, 0, data, len ); + /* Construct metadata */ + memset ( &dest, 0, sizeof ( dest ) ); + dest.fc.sfc_family = AF_FC; + memcpy ( &dest.fc.sfc_port_id, &els->peer_port_id, + sizeof ( dest.fc.sfc_port_id ) ); + memset ( &meta, 0, sizeof ( meta ) ); + meta.flags = ( fc_els_is_request ( els ) ? + XFER_FL_OVER : ( XFER_FL_RESPONSE | XFER_FL_OUT ) ); + meta.dest = &dest.sa; + /* Transmit frame */ if ( ( rc = xfer_deliver_raw_meta ( &els->xchg, data, len, &meta ) ) != 0 ) { @@ -524,6 +535,14 @@ static int fc_els_flogi_rx ( struct fc_els *els, const void *data, return rc; } + /* Send any responses to the newly-assigned peer port ID, if + * applicable. + */ + if ( ! has_fabric ) { + memcpy ( &els->peer_port_id, &els->port->ptp_link_port_id, + sizeof ( els->peer_port_id ) ); + } + return 0; } |