On 01/07/14 9:54 pm, "micha...@cs.wisc.edu" <micha...@cs.wisc.edu> wrote:
>From: Mike Christie <micha...@cs.wisc.edu> > >The custom stats is an array with custom_length indicating the length >of the array. This patch fixes bnx2i and be2iscsi's setting of the >custom stats length. They both just have the one, eh_abort_cnt, so that >should >be in the first entry of the custom array and custom_length should then >be one. > >Reported-by: Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> >Signed-off-by: Mike Christie <micha...@cs.wisc.edu> >Acked-by: Eddie Wai <eddie....@broadcom.com> > >--- > drivers/scsi/be2iscsi/be_iscsi.c | 2 +- > drivers/scsi/bnx2i/bnx2i_iscsi.c | 7 +++---- > 2 files changed, 4 insertions(+), 5 deletions(-) > >diff --git a/drivers/scsi/be2iscsi/be_iscsi.c >b/drivers/scsi/be2iscsi/be_iscsi.c >index fd284ff..8616281 100644 >--- a/drivers/scsi/be2iscsi/be_iscsi.c >+++ b/drivers/scsi/be2iscsi/be_iscsi.c >@@ -914,7 +914,7 @@ void beiscsi_conn_get_stats(struct iscsi_cls_conn >*cls_conn, > stats->r2t_pdus = conn->r2t_pdus_cnt; > stats->digest_err = 0; > stats->timeout_err = 0; >- stats->custom_length = 0; >+ stats->custom_length = 1; > strcpy(stats->custom[0].desc, "eh_abort_cnt"); > stats->custom[0].value = conn->eh_abort_cnt; > } >diff --git a/drivers/scsi/bnx2i/bnx2i_iscsi.c >b/drivers/scsi/bnx2i/bnx2i_iscsi.c >index 166543f..9bd9b81 100644 >--- a/drivers/scsi/bnx2i/bnx2i_iscsi.c >+++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c >@@ -1643,12 +1643,11 @@ static void bnx2i_conn_get_stats(struct >iscsi_cls_conn *cls_conn, > stats->r2t_pdus = conn->r2t_pdus_cnt; > stats->tmfcmd_pdus = conn->tmfcmd_pdus_cnt; > stats->tmfrsp_pdus = conn->tmfrsp_pdus_cnt; >- stats->custom_length = 3; >- strcpy(stats->custom[2].desc, "eh_abort_cnt"); >- stats->custom[2].value = conn->eh_abort_cnt; > stats->digest_err = 0; > stats->timeout_err = 0; >- stats->custom_length = 0; >+ strcpy(stats->custom[0].desc, "eh_abort_cnt"); >+ stats->custom[0].value = conn->eh_abort_cnt; >+ stats->custom_length = 1; > } > > >-- >1.7.1 Acked-by: Vikas Chaudhary <vikas.chaudh...@qlogic.com>
<<attachment: winmail.dat>>
