Author: loos
Date: Fri Jul 21 03:59:56 2017
New Revision: 321321
URL: https://svnweb.freebsd.org/changeset/base/321321
Log:
Restore the changes done in r313982: Replace zero with NULL for pointers.
Spotted by: Harry Schmalzbauer
MFC after: 1 week
Sponsored by: Rubicon Communications, LLC (Netgate)
Modified:
head/sys/dev/netmap/netmap_freebsd.c
head/sys/dev/netmap/netmap_mem2.c
Modified: head/sys/dev/netmap/netmap_freebsd.c
==============================================================================
--- head/sys/dev/netmap/netmap_freebsd.c Fri Jul 21 03:48:09 2017
(r321320)
+++ head/sys/dev/netmap/netmap_freebsd.c Fri Jul 21 03:59:56 2017
(r321321)
@@ -671,7 +671,7 @@ nm_os_pt_memdev_iomap(struct ptnetmap_memdev *ptn_dev,
&rid, 0, ~0, *mem_size, RF_ACTIVE);
if (ptn_dev->pci_mem == NULL) {
*nm_paddr = 0;
- *nm_addr = 0;
+ *nm_addr = NULL;
return ENOMEM;
}
Modified: head/sys/dev/netmap/netmap_mem2.c
==============================================================================
--- head/sys/dev/netmap/netmap_mem2.c Fri Jul 21 03:48:09 2017
(r321320)
+++ head/sys/dev/netmap/netmap_mem2.c Fri Jul 21 03:59:56 2017
(r321321)
@@ -2146,7 +2146,7 @@ netmap_mem_pt_guest_deref(struct netmap_mem_d *nmd)
if (ptnmd->ptn_dev) {
nm_os_pt_memdev_iounmap(ptnmd->ptn_dev);
}
- ptnmd->nm_addr = 0;
+ ptnmd->nm_addr = NULL;
ptnmd->nm_paddr = 0;
}
}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
