diff options
| author | Toomas Soome <tsoome@me.com> | 2019-01-19 10:36:01 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-04-10 09:33:20 +0300 |
| commit | afac708dc1fa673063127e6091e0f29b33739e9e (patch) | |
| tree | ef195cfe690dea36851d963f586b77b061889844 /usr/src | |
| parent | 87f90db88e11450dae14066aad4712c4798415c2 (diff) | |
| download | illumos-joyent-afac708dc1fa673063127e6091e0f29b33739e9e.tar.gz | |
10673 ixgbe: NULL pointer errors
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Gergő Doma <domag02@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/io/ixgbe/ixgbe_buf.c | 12 | ||||
| -rw-r--r-- | usr/src/uts/common/io/ixgbe/ixgbe_main.c | 7 | ||||
| -rw-r--r-- | usr/src/uts/common/io/ixgbe/ixgbe_tx.c | 2 |
3 files changed, 10 insertions, 11 deletions
diff --git a/usr/src/uts/common/io/ixgbe/ixgbe_buf.c b/usr/src/uts/common/io/ixgbe/ixgbe_buf.c index 21f9d1ab8b..5f731bfe88 100644 --- a/usr/src/uts/common/io/ixgbe/ixgbe_buf.c +++ b/usr/src/uts/common/io/ixgbe/ixgbe_buf.c @@ -383,7 +383,7 @@ ixgbe_alloc_tbd_ring(ixgbe_tx_ring_t *tx_ring) if (ret != DDI_DMA_MAPPED) { ixgbe_error(ixgbe, "Could not bind tbd dma resource: %x", ret); - tx_ring->tbd_area.dma_address = NULL; + tx_ring->tbd_area.dma_address = 0; if (tx_ring->tbd_area.acc_handle != NULL) { ddi_dma_mem_free(&tx_ring->tbd_area.acc_handle); tx_ring->tbd_area.acc_handle = NULL; @@ -425,7 +425,7 @@ ixgbe_free_tbd_ring(ixgbe_tx_ring_t *tx_ring) tx_ring->tbd_area.dma_handle = NULL; } tx_ring->tbd_area.address = NULL; - tx_ring->tbd_area.dma_address = NULL; + tx_ring->tbd_area.dma_address = 0; tx_ring->tbd_area.size = 0; tx_ring->tbd_ring = NULL; @@ -502,7 +502,7 @@ ixgbe_alloc_rbd_ring(ixgbe_rx_data_t *rx_data) if (ret != DDI_DMA_MAPPED) { ixgbe_error(ixgbe, "Could not bind rbd dma resource: %x", ret); - rx_data->rbd_area.dma_address = NULL; + rx_data->rbd_area.dma_address = 0; if (rx_data->rbd_area.acc_handle != NULL) { ddi_dma_mem_free(&rx_data->rbd_area.acc_handle); rx_data->rbd_area.acc_handle = NULL; @@ -544,7 +544,7 @@ ixgbe_free_rbd_ring(ixgbe_rx_data_t *rx_data) rx_data->rbd_area.dma_handle = NULL; } rx_data->rbd_area.address = NULL; - rx_data->rbd_area.dma_address = NULL; + rx_data->rbd_area.dma_address = 0; rx_data->rbd_area.size = 0; rx_data->rbd_ring = NULL; @@ -596,7 +596,7 @@ ixgbe_alloc_dma_buffer(ixgbe_t *ixgbe, dma_buffer_t *buf, size_t size) DDI_DMA_DONTWAIT, NULL, &cookie, &cookie_num); if (ret != DDI_DMA_MAPPED) { - buf->dma_address = NULL; + buf->dma_address = 0; if (buf->acc_handle != NULL) { ddi_dma_mem_free(&buf->acc_handle); buf->acc_handle = NULL; @@ -628,7 +628,7 @@ ixgbe_free_dma_buffer(dma_buffer_t *buf) { if (buf->dma_handle != NULL) { (void) ddi_dma_unbind_handle(buf->dma_handle); - buf->dma_address = NULL; + buf->dma_address = 0; } else { return; } diff --git a/usr/src/uts/common/io/ixgbe/ixgbe_main.c b/usr/src/uts/common/io/ixgbe/ixgbe_main.c index 41464050bc..2b8084801c 100644 --- a/usr/src/uts/common/io/ixgbe/ixgbe_main.c +++ b/usr/src/uts/common/io/ixgbe/ixgbe_main.c @@ -2362,7 +2362,7 @@ ixgbe_setup_rx_ring(ixgbe_rx_ring_t *rx_ring) rbd = &rx_data->rbd_ring[i]; rbd->read.pkt_addr = rcb->rx_buf.dma_address; - rbd->read.hdr_addr = NULL; + rbd->read.hdr_addr = 0; } /* @@ -3102,7 +3102,7 @@ ixgbe_init_unicst(ixgbe_t *ixgbe) for (slot = 0; slot < ixgbe->unicst_total; slot++) { mac_addr = ixgbe->unicst_addr[slot].mac.addr; bzero(mac_addr, ETHERADDRL); - (void) ixgbe_set_rar(hw, slot, mac_addr, NULL, NULL); + (void) ixgbe_set_rar(hw, slot, mac_addr, 0, 0); ixgbe->unicst_addr[slot].mac.set = 0; } ixgbe->unicst_init = B_TRUE; @@ -3116,8 +3116,7 @@ ixgbe_init_unicst(ixgbe_t *ixgbe) IXGBE_RAH_AV); } else { bzero(mac_addr, ETHERADDRL); - (void) ixgbe_set_rar(hw, slot, mac_addr, - NULL, NULL); + (void) ixgbe_set_rar(hw, slot, mac_addr, 0, 0); } } } diff --git a/usr/src/uts/common/io/ixgbe/ixgbe_tx.c b/usr/src/uts/common/io/ixgbe/ixgbe_tx.c index b29448eb26..63cbf6ec23 100644 --- a/usr/src/uts/common/io/ixgbe/ixgbe_tx.c +++ b/usr/src/uts/common/io/ixgbe/ixgbe_tx.c @@ -220,7 +220,7 @@ ixgbe_ring_tx(void *arg, mblk_t *mp) * expect to bcopy into pre-allocated page-aligned * buffer */ - hdr_new_mp = allocb(hdr_frag_len, NULL); + hdr_new_mp = allocb(hdr_frag_len, 0); if (!hdr_new_mp) return (mp); bcopy(hdr_nmp->b_rptr, hdr_new_mp->b_rptr, |