diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-04-11 11:39:43 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-04-11 11:39:43 +0000 |
| commit | e4f70ac1007dda1e42e5f5a7f307834cb429824c (patch) | |
| tree | 0894ebda3bb08d662c0a4f634185b86685f412ef /usr/src/uts/common/io/nxge/nxge_txc.c | |
| parent | 26dd5a91c086ec5f65eaaa39f0651013e22d28e9 (diff) | |
| parent | 21cce053c53f8dd4d7cf62745effd4c46fbb143c (diff) | |
| download | illumos-joyent-e4f70ac1007dda1e42e5f5a7f307834cb429824c.tar.gz | |
[illumos-gate merge]
commit 21cce053c53f8dd4d7cf62745effd4c46fbb143c
10638 sd: NULL pointer errors
commit b37cc459553d18521fb935664dd7deb03b07c6a7
10628 nxge: NULL pointer errors
Conflicts:
usr/src/uts/common/io/scsi/targets/sd.c
Diffstat (limited to 'usr/src/uts/common/io/nxge/nxge_txc.c')
| -rw-r--r-- | usr/src/uts/common/io/nxge/nxge_txc.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/usr/src/uts/common/io/nxge/nxge_txc.c b/usr/src/uts/common/io/nxge/nxge_txc.c index 6d75f477f8..7f9e34dbfa 100644 --- a/usr/src/uts/common/io/nxge/nxge_txc.c +++ b/usr/src/uts/common/io/nxge/nxge_txc.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/nxge/nxge_impl.h> #include <sys/nxge/nxge_txc.h> @@ -412,7 +410,7 @@ nxge_txc_handle_port_errors(p_nxge_t nxgep, uint32_t err_status) if (err_status & TXC_INT_STAT_RO_CORR_ERR) { statsp->ro_correct_err++; - NXGE_FM_REPORT_ERROR(nxgep, portn, NULL, + NXGE_FM_REPORT_ERROR(nxgep, portn, 0, NXGE_FM_EREPORT_TXC_RO_CORRECT_ERR); NXGE_ERROR_MSG((nxgep, NXGE_ERR_CTL, "nxge_txc_err_evnts: " @@ -420,7 +418,7 @@ nxge_txc_handle_port_errors(p_nxge_t nxgep, uint32_t err_status) } if (err_status & TXC_INT_STAT_RO_UNCORR_ERR) { statsp->ro_uncorrect_err++; - NXGE_FM_REPORT_ERROR(nxgep, portn, NULL, + NXGE_FM_REPORT_ERROR(nxgep, portn, 0, NXGE_FM_EREPORT_TXC_RO_UNCORRECT_ERR); NXGE_ERROR_MSG((nxgep, NXGE_ERR_CTL, "nxge_txc_err_evnts: " @@ -428,7 +426,7 @@ nxge_txc_handle_port_errors(p_nxge_t nxgep, uint32_t err_status) } if (err_status & TXC_INT_STAT_REORDER_ERR) { statsp->reorder_err++; - NXGE_FM_REPORT_ERROR(nxgep, portn, NULL, + NXGE_FM_REPORT_ERROR(nxgep, portn, 0, NXGE_FM_EREPORT_TXC_REORDER_ERR); NXGE_ERROR_MSG((nxgep, NXGE_ERR_CTL, "nxge_txc_err_evnts: " @@ -460,7 +458,7 @@ nxge_txc_handle_port_errors(p_nxge_t nxgep, uint32_t err_status) } if (err_status & TXC_INT_STAT_SF_CORR_ERR) { statsp->sf_correct_err++; - NXGE_FM_REPORT_ERROR(nxgep, portn, NULL, + NXGE_FM_REPORT_ERROR(nxgep, portn, 0, NXGE_FM_EREPORT_TXC_SF_CORRECT_ERR); NXGE_ERROR_MSG((nxgep, NXGE_ERR_CTL, "nxge_txc_err_evnts: " @@ -468,7 +466,7 @@ nxge_txc_handle_port_errors(p_nxge_t nxgep, uint32_t err_status) } if (err_status & TXC_INT_STAT_SF_UNCORR_ERR) { statsp->sf_uncorrect_err++; - NXGE_FM_REPORT_ERROR(nxgep, portn, NULL, + NXGE_FM_REPORT_ERROR(nxgep, portn, 0, NXGE_FM_EREPORT_TXC_SF_UNCORRECT_ERR); NXGE_ERROR_MSG((nxgep, NXGE_ERR_CTL, "nxge_txc_err_evnts: " |