Date: Thu, 15 Jun 2017 15:14:57 +0200 From: Harry Schmalzbauer <freebsd@omnilan.de> To: Luiz Otavio O Souza <loos@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r319881 - head/sys/dev/netmap Message-ID: <59428851.8040900@omnilan.de> In-Reply-To: <201706122253.v5CMrJBB038568@repo.freebsd.org> References: <201706122253.v5CMrJBB038568@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Bezüglich Luiz Otavio O Souza's Nachricht vom 13.06.2017 00:53 (localtime): > Author: loos > Date: Mon Jun 12 22:53:18 2017 > New Revision: 319881 > URL: https://svnweb.freebsd.org/changeset/base/319881 > > Log: > Update the current version of netmap to bring it in sync with the github > version. > > This commit contains mostly refactoring, a few fixes and minor added > functionality. > > Submitted by: Vincenzo Maffione <v.maffione at gmail.com> > Requested by: many > Sponsored by: Rubicon Communications, LLC (Netgate) > > Modified: > head/sys/dev/netmap/if_ixl_netmap.h > head/sys/dev/netmap/netmap.c > head/sys/dev/netmap/netmap_freebsd.c Here's a interfering change which reverts r313982 for sys/dev/netmap/netmap_freebsd.c: @@ -2143,7 +2146,7 @@ if (ptnmd->ptn_dev) { nm_os_pt_memdev_iounmap(ptnmd->ptn_dev); } - ptnmd->nm_addr = NULL; + ptnmd->nm_addr = 0; ptnmd->nm_paddr = 0; } } … > head/sys/dev/netmap/netmap_mem2.c Also in sys/dev/netmap/netmap_mem2.c r313982 was reverted: @@ -648,7 +671,7 @@ &rid, 0, ~0, *mem_size, RF_ACTIVE); if (ptn_dev->pci_mem == NULL) { *nm_paddr = 0; - *nm_addr = NULL; + *nm_addr = 0; return ENOMEM; } Don't know about the impact of https://svnweb.freebsd.org/base?view=revision&revision=313982 and whether this partial 0/NULL replacement makes sence in sys/dev/netmap/netmap_mem2.c and sys/dev/netmap/netmap_freebsd.c. Just wanted to report and ask for review. Thanks, -harry
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?59428851.8040900>