--- //depot/vendor/freebsd/src/sys/dev/e1000/if_em.c
+++ //depot/user/jhb/cleanup/sys/dev/e1000/if_em.c
@@ -3088,7 +3088,6 @@
 	bus_dmamem_free(dma->dma_tag, dma->dma_vaddr, dma->dma_map);
 	bus_dma_tag_destroy(dma->dma_tag);
 fail_0:
-	dma->dma_map = NULL;
 	dma->dma_tag = NULL;
 
 	return (error);
@@ -3099,12 +3098,15 @@
 {
 	if (dma->dma_tag == NULL)
 		return;
-	if (dma->dma_map != NULL) {
+	if (dma->dma_paddr != 0) {
 		bus_dmamap_sync(dma->dma_tag, dma->dma_map,
 		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(dma->dma_tag, dma->dma_map);
+		dma->dma_paddr = 0;
+	}
+	if (dma->dma_vaddr != NULL) {
 		bus_dmamem_free(dma->dma_tag, dma->dma_vaddr, dma->dma_map);
-		dma->dma_map = NULL;
+		dma->dma_vaddr = NULL;
 	}
 	bus_dma_tag_destroy(dma->dma_tag);
 	dma->dma_tag = NULL;
--- //depot/vendor/freebsd/src/sys/dev/e1000/if_igb.c
+++ //depot/user/jhb/cleanup/sys/dev/e1000/if_igb.c
@@ -3259,7 +3259,6 @@
 	bus_dmamem_free(dma->dma_tag, dma->dma_vaddr, dma->dma_map);
 	bus_dma_tag_destroy(dma->dma_tag);
 fail_0:
-	dma->dma_map = NULL;
 	dma->dma_tag = NULL;
 
 	return (error);
@@ -3270,12 +3269,15 @@
 {
 	if (dma->dma_tag == NULL)
 		return;
-	if (dma->dma_map != NULL) {
+	if (dma->dma_paddr != 0) {
 		bus_dmamap_sync(dma->dma_tag, dma->dma_map,
 		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(dma->dma_tag, dma->dma_map);
+		dma->dma_paddr = 0;
+	}
+	if (dma->dma_vaddr != NULL) {
 		bus_dmamem_free(dma->dma_tag, dma->dma_vaddr, dma->dma_map);
-		dma->dma_map = NULL;
+		dma->dma_vaddr = NULL;
 	}
 	bus_dma_tag_destroy(dma->dma_tag);
 	dma->dma_tag = NULL;
--- //depot/vendor/freebsd/src/sys/dev/e1000/if_lem.c
+++ //depot/user/jhb/cleanup/sys/dev/e1000/if_lem.c
@@ -2527,7 +2527,6 @@
 	bus_dmamem_free(dma->dma_tag, dma->dma_vaddr, dma->dma_map);
 	bus_dma_tag_destroy(dma->dma_tag);
 fail_0:
-	dma->dma_map = NULL;
 	dma->dma_tag = NULL;
 
 	return (error);
@@ -2538,12 +2537,15 @@
 {
 	if (dma->dma_tag == NULL)
 		return;
-	if (dma->dma_map != NULL) {
+	if (dma->dma_paddr != 0) {
 		bus_dmamap_sync(dma->dma_tag, dma->dma_map,
 		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(dma->dma_tag, dma->dma_map);
+		dma->dma_paddr = 0;
+	}
+	if (dma->dma_vaddr != NULL) {
 		bus_dmamem_free(dma->dma_tag, dma->dma_vaddr, dma->dma_map);
-		dma->dma_map = NULL;
+		dma->dma_vaddr = NULL;
 	}
 	bus_dma_tag_destroy(dma->dma_tag);
 	dma->dma_tag = NULL;
--- //depot/vendor/freebsd/src/sys/dev/i40e/i40e_osdep.c
+++ //depot/user/jhb/cleanup/sys/dev/i40e/i40e_osdep.c
@@ -116,7 +116,6 @@
 fail_1:
 	bus_dma_tag_destroy(dma->tag);
 fail_0:
-	dma->map = NULL;
 	dma->tag = NULL;
 	return (err);
 }
--- //depot/vendor/freebsd/src/sys/dev/ixgb/if_ixgb.c
+++ //depot/user/jhb/cleanup/sys/dev/ixgb/if_ixgb.c
@@ -1459,7 +1459,6 @@
 fail_1:
 	bus_dma_tag_destroy(dma->dma_tag);
 fail_0:
-	dma->dma_map = NULL;
 	dma->dma_tag = NULL;
 	return (r);
 }
--- //depot/vendor/freebsd/src/sys/dev/ixgbe/ixgbe.c
+++ //depot/user/jhb/cleanup/sys/dev/ixgbe/ixgbe.c
@@ -2788,7 +2788,6 @@
 fail_1:
 	bus_dma_tag_destroy(dma->dma_tag);
 fail_0:
-	dma->dma_map = NULL;
 	dma->dma_tag = NULL;
 	return (r);
 }
--- //depot/vendor/freebsd/src/sys/dev/ixgbe/ixv.c
+++ //depot/user/jhb/cleanup/sys/dev/ixgbe/ixv.c
@@ -1955,7 +1955,6 @@
 fail_1:
 	bus_dma_tag_destroy(dma->dma_tag);
 fail_0:
-	dma->dma_map = NULL;
 	dma->dma_tag = NULL;
 	return (r);
 }